Added better error handling when editing users.
Merge branch 'master' of https://github.com/cajunjoel/macaw-neh