Adds better messaging when there is no data