diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java
index 141a3b506..8322f9057 100644
--- a/src/main/java/neqsim/thermo/system/SystemThermo.java
+++ b/src/main/java/neqsim/thermo/system/SystemThermo.java
@@ -915,11 +915,18 @@ public void addTBPfraction(String componentName, double numberOfMoles, double mo
       // //refSystem.initPhysicalProperties();
       // // APIdens - refSystem.getPhase(1).getPhysicalProperties().getDensity();
       // sammenligne med API-standard for tetthet - og sette Penloux dt
+    } catch (RuntimeException ex) {
+      // todo: Should not swallow notimplementedexception
+      /*
+       * if (ex.getCause().getClass().equals(NotImplementedException.class)) { throw ex; }
+       */
+      logger.error(ex.getMessage());
     } catch (Exception ex) {
       logger.error(ex.getMessage(), ex);
     }
 
     double critVol = characterization.getTBPModel().calcCriticalVolume(molarMass * 1000, density);
+
     // 0.2918-0.0928*acs)*ThermodynamicConstantsInterface.R*TC/PC*10.0;
     addComponent(componentName, numberOfMoles, TC, PC, acs);
     double Kwatson = Math.pow(TB * 1.8, 1.0 / 3.0) / density;
diff --git a/src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java b/src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java
index b071fc1fe..28590b559 100644
--- a/src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java
+++ b/src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java
@@ -108,8 +108,10 @@ public static void setComposition(SystemInterface fluid, String inputFile) {
           fluid.addComponent(name + pseudoName, ZI.get(counter));
         }
       }
+    } catch (RuntimeException ex) {
+      logger.error(ex.getMessage());
     } catch (Exception ex) {
-      logger.error(ex.getMessage(), ex);
+      logger.error(ex.getMessage());
     }
   }