Properly return None.
Merge remote-tracking branch 'rixner/master'