Adds a cleaner exception handling