Fixes #68, as well as null issue in PMs
Merge pull request #76 from troymccabe/master

Fixes #68, as well as null issue in PMs