diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
index 7ade4f0119..e39fe5d428 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
@@ -419,8 +419,6 @@ public class PropertiesLauncher extends Launcher {
 	/**
 	 * Convenience class for finding nested archives (archive entries that can be
 	 * classpath entries).
-	 * 
-	 * @author Dave Syer
 	 */
 	private static final class ArchiveEntryFilter implements EntryFilter {
 		@Override
@@ -433,8 +431,6 @@ public class PropertiesLauncher extends Launcher {
 	/**
 	 * Convenience class for finding nested archives that have a prefix in their file path
 	 * (e.g. "lib/").
-	 * 
-	 * @author Dave Syer
 	 */
 	private static final class PrefixMatchingArchiveFilter implements EntryFilter {
 		private final String prefix;
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
index fd28fe63c5..9a89fbc2f0 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
@@ -53,19 +53,22 @@ public abstract class Archive {
 			mainClass = manifest.getMainAttributes().getValue("Start-Class");
 		}
 		if (mainClass == null) {
-			String url = "UNKNOWN";
-			try {
-				url = getUrl().toString();
-			}
-			catch (Exception e) {
-				// ignore
-			}
 			throw new IllegalStateException(
-					"No 'Start-Class' manifest entry specified in " + url);
+					"No 'Start-Class' manifest entry specified in " + this);
 		}
 		return mainClass;
 	}
 
+	@Override
+	public String toString() {
+		try {
+			return getUrl().toString();
+		}
+		catch (Exception e) {
+			return "archive";
+		}
+	}
+
 	/**
 	 * Returns the manifest of the archive.
 	 * @return the manifest
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/FileEncodingApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/FileEncodingApplicationContextInitializer.java
index f620020d9a..2c179f60c5 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/FileEncodingApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/FileEncodingApplicationContextInitializer.java
@@ -71,4 +71,4 @@ public class FileEncodingApplicationContextInitializer implements
 			}
 		}
 	}
-};
\ No newline at end of file
+};