Modified files and added error file