Fix controller removal clears exceptions too