Fix issue #225.
Remove unnecessary null pointer checks.
Convert my spaces to tabs.

to fit the rest of the code