Chainsaw fix.

Should no longer give nil pointer error.
Also whitespace fixup.