Added proper error handling, report to client