Fixes from manual testing

Author: JohnMcPMS

src/AppInstallerCLICore/Commands/DscAdminSettingsResource.cpp

@@ -22,7 +22,7 @@ namespace AppInstaller::CLI
             virtual Utility::LocIndView SettingName() const = 0;
 
             // Tests the value.
-            // Returns true if in the deired state; false if not.
+            // Returns true if in the desired state; false if not.
             virtual bool Test() const = 0;
 
             // Sets the value.
@@ -120,9 +120,20 @@ namespace AppInstaller::CLI
                         auto stringSetting = Settings::StringToStringAdminSetting(property);
                         if (stringSetting != Settings::StringAdminSetting::Unknown)
                         {
-                            std::string value = inputSettings[property].asString();
-                            AICLI_LOG(Config, Info, << "String admin setting: " << property << " => " << value);
-                            InputSettings.emplace_back(std::make_unique<AdminSettingsDetails::AdminSetting_String>(stringSetting, value));
+                            const auto& propertyNode = inputSettings[property];
+                            std::optional<std::string> value;
+
+                            if (propertyNode.isNull())
+                            {
+                                AICLI_LOG(Config, Info, << "String admin setting: " << property << " => null");
+                            }
+                            else
+                            {
+                                value = propertyNode.asString();
+                                AICLI_LOG(Config, Info, << "String admin setting: " << property << " => `" << value.value() << "`");
+                            }
+
+                            InputSettings.emplace_back(std::make_unique<AdminSettingsDetails::AdminSetting_String>(stringSetting, std::move(value)));
                             continue;
                         }
 

src/AppInstallerCLICore/Commands/DscComposableObject.h

@@ -162,7 +162,7 @@ namespace AppInstaller::CLI
 
         static void FromJson(Derived* self, const Json::Value* value, bool ignoreFieldRequirements)
         {
-            if (value)
+            if (value && !value->isNull())
             {
                 self->m_value = GetJsonTypeValue<PropertyType>::Get(*value);
             }