Adds back exception handling