Fixed last parts for error handling #3