Switch error checking to only return not found for specific case rather than as fall-through