replace remaining generic exceptions