better error handling
fixed conflicting error messages
Merge pull request #70 from apollo-soft/password-api

Password api