diff --git a/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java b/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java
index ace1622..d9e9a45 100644
--- a/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java
+++ b/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java
@@ -119,7 +119,7 @@
           
           Object result = interp.eval ("bsf_temp_fn()");
           
-          if (result != null && result instanceof PyJavaInstance)
+          if (result instanceof PyJavaInstance)
               result = ((PyJavaInstance)result).__tojava__(Object.class);
           return result;
       } catch (PyException e) {
@@ -137,7 +137,7 @@
 	  String scriptStr = byteify(script.toString ());
 	  importPackage(scriptStr);
 	  Object result = interp.eval (scriptStr);
-	  if (result != null && result instanceof PyJavaInstance)
+	  if (result instanceof PyJavaInstance)
 		result = ((PyJavaInstance)result).__tojava__(Object.class);
 	  return result;
 	} catch (PyException e) {
