Should this test for -1 (NotFound) instead / as well ?