diff --git a/modules/MapOfCountries/pom.xml b/modules/MapOfCountries/pom.xml
index 569430897d..0fb187da6d 100644
--- a/modules/MapOfCountries/pom.xml
+++ b/modules/MapOfCountries/pom.xml
@@ -9,7 +9,7 @@
   
     <groupId>net.clementlevallois</groupId>
     <artifactId>mapofcountries</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <packaging>nbm</packaging>
 
     <name>Map Of Countries</name>
diff --git a/modules/MapOfCountries/src/main/java/net/clementlevallois/mapofcountries/ShapeFileReader.java b/modules/MapOfCountries/src/main/java/net/clementlevallois/mapofcountries/ShapeFileReader.java
index e37a571a5e..361f3664dd 100644
--- a/modules/MapOfCountries/src/main/java/net/clementlevallois/mapofcountries/ShapeFileReader.java
+++ b/modules/MapOfCountries/src/main/java/net/clementlevallois/mapofcountries/ShapeFileReader.java
@@ -46,10 +46,8 @@ Development and Distribution License("CDDL") (collectively, the
 import java.util.Map;
 import org.gephi.graph.api.Edge;
 import org.gephi.graph.api.Graph;
-import org.gephi.graph.api.GraphController;
 import org.gephi.graph.api.GraphModel;
 import org.gephi.graph.api.Node;
-import org.openide.util.Lookup;
 
 /**
  *
@@ -76,10 +74,8 @@ public Graph read(Graph gr, String country, String subregion, String region, Str
 
         InputStream shapes = ShapeFileReader.class.getResourceAsStream("/resources/coordinates.txt");
         InputStream shapesDistricts = ShapeFileReader.class.getResourceAsStream("/resources/Australian states.csv");
-        GraphController gc = Lookup.getDefault().lookup(GraphController.class);
-        GraphModel gm = gc.getGraphModel();
-
-        gr = gm.getGraph();
+        // The model of the graph being laid out, the current workspace's is not the one of a graph in a test or a script
+        GraphModel gm = gr.getModel();
 
         Node node;
         Edge edge;