Fixing issue when no entities received