fix to make not found error more robust