Better handling of no such path