I definitely don't think we should use Address Incomplete - I believe that is specifically intended for use in overlap signalling scenarios, so isn't appropriate for a badly formed URI.

Also, should this check be in the ICSCFRouter class so it is common between both cases?