Added handling for InvalidTypeName