diff --git a/src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java b/src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java
index 3ad50209c5249ed25d687c58d0f3267b118735e7..e7103b323f8da2dcd5ff89359d50f0409a7beda6 100644
--- a/src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java
+++ b/src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java
@@ -245,13 +245,13 @@ public class DefaultConfigurator implements Configurator {
 			return componentList;
 		} catch (DocumentException e) {
 			throw new ConfigurationException(
-					"Failed to load configuration from file " + configFile, e);
+					"Failed to load configuration from file " + configFile + " (DocumentException)", e);
 		} catch (ParserConfigurationException e) {
 			throw new ConfigurationException(
-					"Failed to load configuration from file " + configFile, e);
+					"Failed to load configuration from file " + configFile + " (ParserConfigurationException)", e);
 		} catch (SAXException e) {
 			throw new ConfigurationException(
-					"Failed to load configuration from file " + configFile, e);
+					"Failed to load configuration from file " + configFile + " (SAXException)", e);
 		}
 
 	}
diff --git a/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java b/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java
index 7dcbc4840c463455e7e5ff926fba3e48371bfcee..0d1084e0557bdf7b42bd7136078ac70e54ac1aff 100644
--- a/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java
+++ b/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java
@@ -33,11 +33,9 @@ import de.tud.kom.p2psim.api.common.SimHost;
 import de.tudarmstadt.maki.simonstrator.api.Graphs;
 import de.tudarmstadt.maki.simonstrator.api.Host;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
-import de.tudarmstadt.maki.simonstrator.api.common.graph.DirectedEdge;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.Graph;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.IEdge;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.INode;
-import de.tudarmstadt.maki.simonstrator.api.common.graph.Node;
 import de.tudarmstadt.maki.simonstrator.api.component.ComponentNotAvailableException;
 import de.tudarmstadt.maki.simonstrator.api.component.core.OracleComponent;
 import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;