Fix issue#10: removed unnecessary null pointer checks