#214 fixing abundant null checks

fixed..
Some more Javadoc here as well, please. :)