minor cleanups to catch some errors
minor cleanups to catch some errors

make sure to return an error to the client rather than an exception

jokajak/password-manager,jokajak/password-manager,jokajak/password-manager,jokajak/password-manager,jokajak/password-manager