Remove legacy handling
Separate exceptions
Exceptions are raised