move any potential nastiness into the @try/@catch
Merge branch 'master' of github.com:brianmichel/HeaderLocker