diff --git a/springloaded/src/main/java/org/springsource/loaded/TypeRegistry.java b/springloaded/src/main/java/org/springsource/loaded/TypeRegistry.java
index 1f66b17..8c21bd2 100644
--- a/springloaded/src/main/java/org/springsource/loaded/TypeRegistry.java
+++ b/springloaded/src/main/java/org/springsource/loaded/TypeRegistry.java
@@ -823,6 +823,10 @@ public class TypeRegistry {
 		if (GlobalConfiguration.verboseMode && log.isLoggable(Level.FINER)) {
 			log.finer("entering TypeRegistry.isReloadableTypeName(" + slashedName + ")");
 		}
+		if (slashedName == null) {
+			return ReloadableTypeNameDecision.No;
+		}
+
 		if (GlobalConfiguration.assertsMode) {
 			Utils.assertSlashed(slashedName);
 		}
diff --git a/springloaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java b/springloaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
index 8d5c4ab..490e686 100644
--- a/springloaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
+++ b/springloaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
@@ -122,11 +122,6 @@ public class SpringLoadedPreProcessor implements Constants {
 			return bytes;
 		}
 
-		if (slashedClassName == null && bytes != null) {
-			// The lambda meta factory can spin up classes that come through here with no class name specified
-			slashedClassName = Utils.discoverClassname(bytes);
-		}
-
 		// TODO need configurable debug here, ability to dump any code before/after
 		for (Plugin plugin : getGlobalPlugins()) {
 			if (plugin instanceof LoadtimeInstrumentationPlugin) {