A null check was already in there but I've changed the notation to match the coding style of the rest of the codebase. Will come along in next commit.