Fully solved the error handling to 1.4