diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp
index ac4cea896..1fdfc6daa 100644
--- a/src/libcalamares/Settings.cpp
+++ b/src/libcalamares/Settings.cpp
@@ -32,7 +32,7 @@
 static bool
 hasValue( const YAML::Node& v )
 {
-    return !( ( v.Type() == YAML::NodeType::Null ) || ( v.Type() == YAML::NodeType::Undefined ) );
+    return v.IsDefined() && !v.IsNull();
 }
 
 /** Helper function to grab a QString out of the config, and to warn if not present. */