diff --git a/org.ntlab.traceAnalyzer/src/org/ntlab/deltaExtractor/DeltaExtractor.java b/org.ntlab.traceAnalyzer/src/org/ntlab/deltaExtractor/DeltaExtractor.java
index 2a3b809..fbba8de 100644
--- a/org.ntlab.traceAnalyzer/src/org/ntlab/deltaExtractor/DeltaExtractor.java
+++ b/org.ntlab.traceAnalyzer/src/org/ntlab/deltaExtractor/DeltaExtractor.java
@@ -1079,9 +1079,7 @@
 		eStructure = new ExtractedStructure();
 		eStructure.setRelatedTracePoint(thisTracePoint.duplicate());
 		MethodExecution methodExecution = thisTracePoint.getMethodExecution();
-		if (!thisTracePoint.isMethodEntry()) {
-			thisTracePoint.stepNext();
-		}
+		thisTracePoint.stepNext();
 		ArrayList<String> objList = new ArrayList<String>();
 		String thisObjectId = methodExecution.getThisObjId();
 		objList.add(thisObjectId);
diff --git a/org.ntlab.traceAnalyzer/src/org/ntlab/trace/MethodExecution.java b/org.ntlab.traceAnalyzer/src/org/ntlab/trace/MethodExecution.java
index 67a35b7..8a21936 100644
--- a/org.ntlab.traceAnalyzer/src/org/ntlab/trace/MethodExecution.java
+++ b/org.ntlab.traceAnalyzer/src/org/ntlab/trace/MethodExecution.java
@@ -204,7 +204,7 @@
 				} else if (s instanceof MethodInvocation) {
 					MethodInvocation m = (MethodInvocation) s;
 					ObjectReference ret = m.getCalledMethodExecution().getReturnValue();
-					if (ret.getActualType().equals(actualTypeName)) {
+					if (ret != null && ret.getActualType().equals(actualTypeName)) {
 						objectRefMap.put(ret, tp.duplicate());												
 					}
 				}