[#44867857] Better handling of invalid sources/destinations