Refactor and simplify NullHandler() call.