Improvements - error handling