diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/PMXController.java b/tools.descartes.pmx/src/tools/descartes/pmx/PMXController.java
index dad413ee40edaff5430aadb3d604774e9f903cb4..ce32cf053a24fe59c14256e85a29f4ace8dca058 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/PMXController.java
+++ b/tools.descartes.pmx/src/tools/descartes/pmx/PMXController.java
@@ -118,11 +118,14 @@ public class PMXController {
 	}
 
 	public static IModelBuilder getModelBuilder() {
+		if (modelBuilder == null) {
+			log.error("builder not initialized");
+		}
 		return modelBuilder;
 	}
 
-	public static void setModelBuilder(IModelBuilder modelBuilder2) {
-		modelBuilder = modelBuilder2;
+	public static void setModelBuilder(IModelBuilder newModelBuilder) {
+		modelBuilder = newModelBuilder;
 	}