--- a/GroovyEvaluator.st	Tue Aug 05 22:41:36 2014 +0100
+++ b/GroovyEvaluator.st	Wed Aug 06 14:24:38 2014 +0100
@@ -242,7 +242,9 @@
             | value jvalue |
 
             value := pair first value.
-            jvalue := value class isJavaPrimitiveType ifTrue:[ value class javaWrapperClass javaWrap: value ] ifFalse:[ value ].
+            jvalue := value notNil 
+                        ifTrue:[value class isJavaPrimitiveType ifTrue:[ value class javaWrapperClass javaWrap: value ] ifFalse:[ value ]]
+                        ifFalse:[nil].
             context setVariable: name to: jvalue.
         ].
         [
@@ -265,7 +267,7 @@
     ^ result class javaUnwrap: result.
 
     "Created: / 19-02-2014 / 09:13:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 13-06-2014 / 08:38:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 06-08-2014 / 14:01:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !GroovyEvaluator methodsFor:'error reporting'!