Correctly deal with a controller returning None