Better exception handling was added