Exception handling was fixed