Properly Handle EMS Non-Transports