Fixed error messaging
Error handling: changed error status