diff --git a/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java b/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java
index 3abef9bb..69d07cd1 100644
--- a/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java
+++ b/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java
@@ -42,10 +42,11 @@ public class AccessPoint {
 
 		Node serverNode = ParserUtils.getChildNodeWithTag(apNode, "Server");
 		
-		if (serverNode != null)
-	                this.server = new Server(serverNode, typeDeclarations);
-		
-	}
+        if (serverNode == null) {
+            server = null;
+        } else {
+            server = new Server(serverNode, typeDeclarations);
+        }
 
 	public String getName() {
 		return name;