@saleem: Changed error messages to be more meaningful