Added empty check to raw results