Second commit

Added some user error handling