Moved exceptions into core