Improved UnknownUnitException