GH #379: Remove unnecessary null pointer checks