increase error handling