Change handling errors #44

Take a look a at the line 45.