diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index b949a0c4d68984d837a4648fd1fab1add05031b8..87ae8f109cc665062b9f4611baca46f8fa691dc5 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -7165,13 +7165,14 @@ public class GTURTLEModeling {
         TML2TURTLE tt = new TML2TURTLE(tmlm);
         tm = tt.generateTURTLEModeling();
         if ((checkingErrors != null) && (checkingErrors.size() > 0)){
+	    TraceManager.addDev("Error in TURTLE generation");
             analyzeErrors();
             return false;
         } else {
             // Optimize
-            //TraceManager.addDev("Optimize");
+            TraceManager.addDev("Optimize");
             tm.optimize();
-            //TraceManager.addDev("Optimize done");
+            TraceManager.addDev("Optimize done");
             TURTLEModelChecker tmc = new TURTLEModelChecker(tm);
             checkingErrors = tmc.syntaxAnalysisChecking();
             if ((checkingErrors != null) && (checkingErrors.size() > 0)){
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 08c901e762f04ee651a963d18c7f1647f70dbd7d..baf1c30faaf316e89d5302b3c1f5a7366e3a975d 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -3982,6 +3982,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     // 1: ok, code already generated
     public int generateTURTLEModelingFromState(int state, boolean automatic, int generator) {
         if (state == 1) {
+	    TraceManager.addDev("Generating from state 1");
             if (generateTIFFromMapping(automatic, generator)) {
                 return 1;
             }
@@ -4215,7 +4216,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
             }
 	    else {
                 if (generateTURTLEModelingFromState(gtm.getTURTLEModelingState(), false, UPPAAL) == -1) {
-        		TraceManager.addDev("4202");
+		    TraceManager.addDev("4202 - UPPAAL generation failed");
                     return;
                 }
 		TraceManager.addDev( "About to open the window at line 4198" );