added check for no data