--- a/core/com.nokia.carbide.cpp.sdk.core.test/Data/var/group1/epoc32/tools/variant/dino79.var	Thu Dec 10 14:53:07 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/Data/var/group1/epoc32/tools/variant/dino79.var	Thu Dec 10 14:56:18 2009 -0600
@@ -1,3 +1,4 @@
+# dino.var
 VARIANT			  				dino79
 
 EXTENDS								flintstone500
@@ -8,5 +9,5 @@
 
 ROM_INCLUDE	prepend   /epoc32/include/config/flintstone500/dino79
 ROM_INCLUDE	prepend   /epoc32/rom/config/flintstone500/dino79
+# comment
 
-

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianMacroStore.java	Thu Dec 10 14:53:07 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianMacroStore.java	Thu Dec 10 14:56:18 2009 -0600
@@ -391,6 +391,7 @@
     public List<String> getSDKVersions(){
     	List<String> verList = new ArrayList<String>();
     	
+    	verList.add("5.2");
     	verList.add("5.1");
     	verList.add("5.0");
     	verList.add("3.2");

--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/sbv/SBVView.java	Thu Dec 10 14:53:07 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/sbv/SBVView.java	Thu Dec 10 14:56:18 2009 -0600
@@ -17,22 +17,31 @@
 
 package com.nokia.carbide.internal.cpp.epoc.engine.model.sbv;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.text.IDocument;
 
-import com.nokia.carbide.cpp.epoc.engine.model.*;
+import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
+import com.nokia.carbide.cpp.epoc.engine.model.IData;
+import com.nokia.carbide.cpp.epoc.engine.model.IViewConfiguration;
 import com.nokia.carbide.cpp.epoc.engine.model.sbv.ISBVOwnedModel;
 import com.nokia.carbide.cpp.epoc.engine.model.sbv.ISBVView;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.dom.ASTFactory;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.dom.IASTTopLevelNode;
-import com.nokia.carbide.internal.api.cpp.epoc.engine.dom.sbv.*;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.dom.sbv.IASTSBVArgumentStatement;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.dom.sbv.IASTSBVFlagStatement;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.dom.sbv.IASTSBVTranslationUnit;
 import com.nokia.carbide.internal.cpp.epoc.engine.model.ModelBase;
 import com.nokia.carbide.internal.cpp.epoc.engine.model.ViewBase;
 import com.nokia.carbide.internal.cpp.epoc.engine.parser.IDocumentParser;
 import com.nokia.carbide.internal.cpp.epoc.engine.parser.ParserFactory;
-import com.nokia.cpp.internal.api.utils.core.*;
+import com.nokia.cpp.internal.api.utils.core.IMessage;
+import com.nokia.cpp.internal.api.utils.core.MessageLocation;
 
 
 public class SBVView extends ViewBase<ISBVOwnedModel> implements ISBVView {
@@ -92,7 +101,11 @@
 				String value = ((IASTSBVArgumentStatement) stmt).getArgument().getValue();
 				handleStatement(option, value);
 			} else { 
-				Check.checkState(false);
+				if (!stmt.getOriginalText().startsWith("#")){
+					// Not a comment or known keyword
+					String errMsg = "Ignoring unknown statement: " + stmt.getOriginalText() + " in " + stmt.getSourceReference(); //$NON-NLS-N$ 
+					EpocEnginePlugin.getDefault().getLog().log(new Status(IStatus.ERROR, EpocEnginePlugin.EPOC_ENGINE_PLUGIN_ID, errMsg, null));
+				}
 			}
 		}
 	}