Merge pull request #169 from daverboy23/master

encryption exception fix