As long as you are modifying this conditional, can you add curly braces around the `return null` to conform with overall style goals.  (Sorry I introduced this style defect previously...)