Changed default catch back to Exception