tidy up how non existing entries are handle in fs