Added null checks and configurability

Per the suggestions in pull request comments, I've added a null check and
CloakInfo options to make the behaviour configurable. I also fixed the
indentation issue with my edit to AUTHORS.