Fix broad exception classes