Fixes yet another NoneType error
Merge pull request #48 from mpath/rm_3652_3

Fixes yet another NoneType error