imporved error handling