added check for NOT FOUND