Bypass + message fixes
Merge pull request #579 from Fuzzysqurl/patch-1

Bypass + message fixes