Exception handling was added.