Fix error and add check for latest calls when it encounters zero results