diff --git a/jode/jode/flow/ReturnBlock.java b/jode/jode/flow/ReturnBlock.java
index abf26d4..5c4ece4 100644
--- a/jode/jode/flow/ReturnBlock.java
+++ b/jode/jode/flow/ReturnBlock.java
@@ -45,13 +45,14 @@ public class ReturnBlock extends InstructionContainer {
      * @return stack the stack afterwards.
      */
     public VariableStack mapStackToLocal(VariableStack stack) {
-	VariableStack newStack;
-	int params = instr.getOperandCount();
-	if (params > 0) {
-	    this.stack = stack.peek(params);
-	    newStack = stack.pop(params);
-	} else 
-	    newStack = stack;
+	VariableStack newStack = stack;
+	if (instr != null) {
+	    int params = instr.getOperandCount();
+	    if (params > 0) {
+		this.stack = stack.peek(params);
+		newStack = stack.pop(params);
+	    }
+	}
 	return null;
     }