diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/SelfTest.java b/datamover/source/java/ch/systemsx/cisd/datamover/SelfTest.java
index 90de058da07ca799be6d71910b5936ddbc321072..a3f0b8319f3227f88479b8724cdd7b28e8086943 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/SelfTest.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/SelfTest.java
@@ -64,12 +64,20 @@ public class SelfTest
                 try
                 {
                     selfTestable.check();
+                } catch (EnvironmentFailureException ex)
+                {
+                    notificationLog.error("Self-test failed for self testable '" + selfTestable
+                            + "'. This self-testable is remote and the resource may become "
+                            + "available later, thus continuing anyway.", ex);
+                    // TODO 2008-08-12, Bernd Rinn: ensure we never throw a
+                    // ConfigurationFailureException in any SelfTestable if we are not sure that it
+                    // is a configuration problem rather than a problem with the environment. Then,
+                    // when this is done, remove this catch clause.
                 } catch (ConfigurationFailureException ex)
                 {
                     notificationLog.error("Self-test failed for self testable '" + selfTestable
                             + "'. This self-testable is remote and the resource may become "
-                            + "available later, thus continuing anyway [error message: "
-                            + ex.getMessage() + ".");
+                            + "available later, thus continuing anyway.", ex);
                 }
             } else
             {