diff --git a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java
index ec013937024..8e4dea77e1c 100644
--- a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java
+++ b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java
@@ -299,16 +299,18 @@ public class MesonPropertyPage extends PropertyPage {
 				return false;
 			}
 		} else {
-			StringBuilder mesonargs = new StringBuilder();
-			for (IMesonPropertyPageControl control : componentList) {
-				if (!control.getUnconfiguredString().isEmpty()) {
-					mesonargs.append(control.getUnconfiguredString());
-					mesonargs.append(" "); //$NON-NLS-1$
+			if (buildConfig != null) {
+				StringBuilder mesonargs = new StringBuilder();
+				for (IMesonPropertyPageControl control : componentList) {
+					if (!control.getUnconfiguredString().isEmpty()) {
+						mesonargs.append(control.getUnconfiguredString());
+						mesonargs.append(" "); //$NON-NLS-1$
+					}
 				}
+				buildConfig.setProperty(IMesonConstants.MESON_ARGUMENTS, mesonargs.toString());
+				buildConfig.setProperty(IMesonConstants.MESON_ENV, envText.getText().trim());
+				buildConfig.setProperty(IMesonConstants.MESON_PROJECT_OPTIONS, projText.getText().trim());
 			}
-			buildConfig.setProperty(IMesonConstants.MESON_ARGUMENTS, mesonargs.toString());
-			buildConfig.setProperty(IMesonConstants.MESON_ENV, envText.getText().trim());
-			buildConfig.setProperty(IMesonConstants.MESON_PROJECT_OPTIONS, projText.getText().trim());
 		}
 		return true;
 	}