Reorganized the Errors. Still to check...