Removed unnecessary null checks. Resolves #13