#214 fixing abundant null checks

fixed..
Could you give a more verbose Javadoc here? For me, it's hard to grasp what this is for. ;)