Expanded some generic exceptions.