added required and includes error handlers