Minor cleanup of recursion exception handling