Swapped back older exception handling.