Added Exception handling back.