Fix null ref
Revert "Cleanup: Code formatting."

This reverts commit a723620bf45fe1b3b854c17d39dac9db937e1142.
Merge pull request #310 from gcastre/master

Fix null ref