diff --git a/plugins/net.bioclipse.cdk.smartsmatching/META-INF/MANIFEST.MF b/plugins/net.bioclipse.cdk.smartsmatching/META-INF/MANIFEST.MF
index 92defb43b..e5c7f9539 100644
--- a/plugins/net.bioclipse.cdk.smartsmatching/META-INF/MANIFEST.MF
+++ b/plugins/net.bioclipse.cdk.smartsmatching/META-INF/MANIFEST.MF
@@ -16,12 +16,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.openscience.cdk.renderbasic,
  org.openscience.cdk.renderextra,
  net.bioclipse.cdk.ui.sdfeditor,
- javax.vecmath
+ javax.vecmath,
+ org.openscience.cdk.smarts,
+ org.openscience.cdk.standard
 Bundle-ActivationPolicy: lazy
 Import-Package: net.bioclipse.core.business,
  net.bioclipse.core.domain,
  net.bioclipse.core.domain.props,
  org.apache.log4j,
- org.eclipse.core.resources,
- org.openscience.cdk.exception,
- org.openscience.cdk.smiles.smarts
+ org.eclipse.core.resources
diff --git a/plugins/net.bioclipse.cdk.smartsmatching/src/net/bioclipse/cdk/smartsmatching/AddEditSmartsDialog.java b/plugins/net.bioclipse.cdk.smartsmatching/src/net/bioclipse/cdk/smartsmatching/AddEditSmartsDialog.java
index 1c59b783c..7e42449ae 100644
--- a/plugins/net.bioclipse.cdk.smartsmatching/src/net/bioclipse/cdk/smartsmatching/AddEditSmartsDialog.java
+++ b/plugins/net.bioclipse.cdk.smartsmatching/src/net/bioclipse/cdk/smartsmatching/AddEditSmartsDialog.java
@@ -29,6 +29,7 @@
 import org.eclipse.ui.PlatformUI;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.smiles.smarts.SMARTSQueryTool;
+import org.openscience.cdk.smiles.smarts.parser.TokenMgrError;
 
 
 public class AddEditSmartsDialog extends TitleAreaDialog{
@@ -135,6 +136,7 @@ protected void buttonPressed(int buttonId) {
 
             smartsWrapper.setName( txtName.getText() );
             smartsWrapper.setSmartsString( txtSmarts.getText() );
+            smartsWrapper.validate();
 
             okPressed();
             return;
@@ -153,16 +155,19 @@ private void updateStatus(){
             setErrorMessage("SMARTS string must not be empty");
             return;
         }
-        if (!(cdk.isValidSmarts( txtSmarts.getText() ))){
-            try {
-                new SMARTSQueryTool( txtSmarts.getText() );
-            } catch (CDKException e) {
-                setErrorMessage( "SMARTS string is not valid: \"" 
-                                 + e.getMessage() + "\"" );
-            }
+        
+        try {
+            new SMARTSQueryTool(txtSmarts.getText());
+        } catch (Exception e) {
+            setErrorMessage( e.getMessage() );
         }
+
+//        if (!(cdk.isValidSmarts( txtSmarts.getText() ))){
+//            setErrorMessage( "SMARTS string is not valid. " );
+//        }
         
         getButtonBar().update();
+
     }
 
     private void showMessage(String message) {