Better error message when loading molecule

Fix for NPE when no reader is created see bug 3610 Better error message if format in null
bioclipse · Nov 18, 2014 · a7a2fd3 · a7a2fd3
1 parent 1845f72
commit a7a2fd3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/CDKManager.java b/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/CDKManager.java
@@ -308,10 +308,15 @@ public ICDKMolecule loadMolecule( InputStream instream,
 
         // Create the reader
         ISimpleChemObjectReader reader = readerFactory.createReader(format);
-        if (handler != null) reader.setErrorHandler(handler);
         if (reader == null) {
-            throw new BioclipseException("Could not create reader in CDK.");
+            String message = "Could not create reader in CDK.";
+            if ( format == null ) {
+                message = "Unsupported file format in CDK";
+            }
+            throw new BioclipseException( message );
         }
+        if ( handler != null )
+            reader.setErrorHandler( handler );
 
         try {
             reader.setReader(instream);