#214 addressing superfluous NPE checks and adding NPE rudimentary unit tests