fixed last commit error handling