Added some error handling around the password command.