Fixed to not break code when deviceInfo is null