diff --git a/src/de/fernflower/main/Fernflower.java b/src/de/fernflower/main/Fernflower.java
index a712450..4f84c89 100644
--- a/src/de/fernflower/main/Fernflower.java
+++ b/src/de/fernflower/main/Fernflower.java
@@ -65,7 +65,11 @@ public class Fernflower implements IDecompiledData {
 		
 		structcontext.saveContext();
 	}
-	
+
+  public void clearContext() {
+    DecompilerContext.setCurrentContext(null);
+  }
+
 	public String getClassEntryName(StructClass cl, String entryname) {
 		
 		ClassNode node = clprocessor.getMapRootClasses().get(cl.qualifiedName);
diff --git a/src/de/fernflower/main/decompiler/IdeDecompiler.java b/src/de/fernflower/main/decompiler/IdeDecompiler.java
index 4f3b899..d3dc36b 100644
--- a/src/de/fernflower/main/decompiler/IdeDecompiler.java
+++ b/src/de/fernflower/main/decompiler/IdeDecompiler.java
@@ -44,7 +44,11 @@ public class IdeDecompiler {
   }
 
   public void decompileContext() {
-		fernflower.decompileContext();
-	}
-	
+    try {
+      fernflower.decompileContext();
+    } finally {
+      fernflower.clearContext();
+    }
+  }
+
 }