fix an npe
Merge pull request #2357 from devoncarew/devoncarew_npe

fix an npe