Merge pull request #188 from wxsBSD/null_ptr_fix

Fix a NULL ptr deref.
Merge branch 'master' into authenticode