Added manual test scripts for return None. Added a condition on the Java side to prevent NPE. refs #118