Add check for no returned data