diff --git a/stratosphere-core/src/main/java/eu/stratosphere/core/fs/FileSystem.java b/stratosphere-core/src/main/java/eu/stratosphere/core/fs/FileSystem.java
index <HASH>..<HASH> 100644
--- a/stratosphere-core/src/main/java/eu/stratosphere/core/fs/FileSystem.java
+++ b/stratosphere-core/src/main/java/eu/stratosphere/core/fs/FileSystem.java
@@ -200,7 +200,8 @@ public abstract class FileSystem {
 				}
 				catch (URISyntaxException e) {
 					// we tried to repair it, but could not. report the scheme error
-					throw new IOException("FileSystem: Scheme is null. file:// or hdfs:// are example schemes.");
+					throw new IOException("FileSystem: Scheme is null. file:// or hdfs:// are example schemes. "
+							+ "Failed for " + uri.toString() + ".");
 				}
 			}
 
@@ -213,7 +214,8 @@ public abstract class FileSystem {
 
 			// Try to create a new file system
 			if (!FSDIRECTORY.containsKey(uri.getScheme())) {
-				throw new IOException("No file system found with scheme " + uri.getScheme());
+				throw new IOException("No file system found with scheme " + uri.getScheme()
+				+ ". Failed for " + uri.toString() + ".");
 			}
 
 			Class<? extends FileSystem> fsClass = null;
FS.get(): Add URI causing exception to message.