diff --git a/src/main/java/avatartranslator/modelchecker/SafetyProperty.java b/src/main/java/avatartranslator/modelchecker/SafetyProperty.java
index 7085d1bda9b51531e447df4c6da5fa436a9f78eb..967836ba91b5474764d3994d16435b8dec549b1e 100644
--- a/src/main/java/avatartranslator/modelchecker/SafetyProperty.java
+++ b/src/main/java/avatartranslator/modelchecker/SafetyProperty.java
@@ -269,12 +269,12 @@ public class SafetyProperty  {
     }
     
     private String checkExpectedResult(String tmpP) {
-        if (tmpP.startsWith("T") || tmpP.startsWith("t")) {
+        if (tmpP.startsWith("T ") || tmpP.startsWith("t ")) {
             expectedResult = true;
-            return tmpP.substring(1).trim();
-        } else if (tmpP.startsWith("F") || tmpP.startsWith("f")) {
+            return tmpP.substring(2).trim();
+        } else if (tmpP.startsWith("F ") || tmpP.startsWith("f ")) {
             expectedResult = false;
-            return tmpP.substring(1).trim();
+            return tmpP.substring(2).trim();
         }
         
         return tmpP;
diff --git a/src/main/java/avatartranslator/modelcheckervalidator/ModelCheckerValidator.java b/src/main/java/avatartranslator/modelcheckervalidator/ModelCheckerValidator.java
index 23618c6f408ab4e3f7252a23a71e5f794cc3e398..af80169f451f1841432a16247fa2318d30bc6d9f 100644
--- a/src/main/java/avatartranslator/modelcheckervalidator/ModelCheckerValidator.java
+++ b/src/main/java/avatartranslator/modelcheckervalidator/ModelCheckerValidator.java
@@ -286,8 +286,8 @@ public class ModelCheckerValidator {
     
     
     private static String removeExpectedResult(String query) {
-        if (query.matches("^[TtFf].*")) {
-            return query.substring(1).trim();
+        if (query.matches("^[TtFf]\\s.*")) {
+            return query.substring(2).trim();
         } else {
             return query;
         }
diff --git a/src/main/java/ui/AvatarDesignPanelTranslator.java b/src/main/java/ui/AvatarDesignPanelTranslator.java
index 47567278d2944adc37b98d3f9d12989acb8624c5..a873c0f27d62e546a4c1855ad0d5feb5329d0ae4 100644
--- a/src/main/java/ui/AvatarDesignPanelTranslator.java
+++ b/src/main/java/ui/AvatarDesignPanelTranslator.java
@@ -425,8 +425,8 @@ public class AvatarDesignPanelTranslator {
         _pragma = _pragma.trim();
         
         //remove expected result letter from the start if present
-        if (_pragma.matches("^[TtFf].*")) {
-            _pragma = _pragma.substring(1).trim();
+        if (_pragma.matches("^[TtFf]\\s.*")) {
+            _pragma = _pragma.substring(2).trim();
         }
 
         if (_pragma.contains("=") && !(_pragma.contains("==") || _pragma.contains("<=") || _pragma.contains(">=") || _pragma.contains("!="))) {
@@ -460,10 +460,10 @@ public class AvatarDesignPanelTranslator {
             String state1 = _pragma.split("-->")[0];
             String state2 = _pragma.split("-->")[1];
             //    System.out.println("checking... " + state1 + " " + state2);
-            if (!state1.contains(".") || !state2.contains(".")) {
-                TraceManager.addDev("Safety Pragma " + _pragma + " cannot be parsed: missing '.'");
-                return false;
-            }
+//            if (!state1.contains(".") || !state2.contains(".")) {
+//                TraceManager.addDev("Safety Pragma " + _pragma + " cannot be parsed: missing '.'");
+//                return false;
+//            }
             if (!statementParser(state1, as, _pragma, tgc)) {
                 return false;
             }
@@ -482,6 +482,10 @@ public class AvatarDesignPanelTranslator {
 
 
         } else {
+            UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, "Pragma " + _pragma + " cannot be parsed: wrong or missing CTL header");
+            ce.setTDiagramPanel(adp.getAvatarBDPanel());
+            ce.setTGComponent(tgc);
+            addWarning(ce);
             TraceManager.addDev("Safety Pragma " + _pragma + " cannot be parsed");
             return false;
         }
@@ -501,16 +505,19 @@ public class AvatarDesignPanelTranslator {
         }
         
         state = replaceOperators(state);
-        if (statementParserRec(state, as, _pragma, tgc) == 1) {
+        int returnVal = statementParserRec(state, as, _pragma, tgc);
+        if (returnVal == 1) {
             UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, "Safety Pragma " + _pragma + " has invalid return type");
             ce.setTDiagramPanel(adp.getAvatarBDPanel());
             ce.setTGComponent(tgc);
             addWarning(ce);
             TraceManager.addDev("UPPAAL Pragma " + _pragma + " improperly formatted");
             return false;
+        } else if (returnVal == -1) {
+            return false;
+        } else {
+            return true;
         }
-        
-        return true;
 
         //Divide into simple statements
         
@@ -698,6 +705,7 @@ public class AvatarDesignPanelTranslator {
     }
     
     private int statementParserRec(String state, AvatarSpecification as, String _pragma, TGComponent tgc) {
+        //returns -1 for errors, 0 for boolean result type, and 1 for int result type
         boolean isNot = false;
         boolean isNegated = false;
         
diff --git a/src/main/java/ui/window/JDialogUPPAALValidation.java b/src/main/java/ui/window/JDialogUPPAALValidation.java
index baa855e6e576860a959dc98faa2a72b6e7cb2e87..ff6a3510318708ec6c78a4d8e3b099fb0a0d9df5 100644
--- a/src/main/java/ui/window/JDialogUPPAALValidation.java
+++ b/src/main/java/ui/window/JDialogUPPAALValidation.java
@@ -869,11 +869,11 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
         query = query.trim();
         expectedResult = true;
         
-        if (query.startsWith("T") || query.startsWith("t")) {
-            return query.substring(1).trim();
-        } else if (query.startsWith("F") || query.startsWith("f")) {
+        if (query.startsWith("T ") || query.startsWith("t ")) {
+            return query.substring(2).trim();
+        } else if (query.startsWith("F ") || query.startsWith("f ")) {
             expectedResult = false;
-            return query.substring(1).trim();
+            return query.substring(2).trim();
         }
         
         return query;