Exception handling fixed