Narrow the list of exception types thrown here?