make exception catches more specific