Removed faulty exception handling