Added more error reporting to client