Added improvements to error handling