diff --git a/reflect/src/main/java/dagger/reflect/TypeUtil.java b/reflect/src/main/java/dagger/reflect/TypeUtil.java
index 62405a1a..9c77a181 100644
--- a/reflect/src/main/java/dagger/reflect/TypeUtil.java
+++ b/reflect/src/main/java/dagger/reflect/TypeUtil.java
@@ -86,9 +86,7 @@ static final class ParameterizedTypeImpl implements ParameterizedType {
                 "unexpected owner type for " + rawType + ": " + ownerType);
           }
         } else if (enclosingClass != null) {
-          // TODO ?
-          //          throw new IllegalArgumentException("unexpected owner type for " + rawType + ":
-          // null");
+            throw new IllegalArgumentException("unexpected owner type for " + rawType + ": null");
         }
       }
 
diff --git a/reflect/src/main/java/dagger/reflect/UnlinkedJustInTimeBinding.java b/reflect/src/main/java/dagger/reflect/UnlinkedJustInTimeBinding.java
index a6067a93..35e0223e 100644
--- a/reflect/src/main/java/dagger/reflect/UnlinkedJustInTimeBinding.java
+++ b/reflect/src/main/java/dagger/reflect/UnlinkedJustInTimeBinding.java
@@ -75,7 +75,7 @@ private static boolean hasParameterizedTypeVariable(Type parameterType) {
   private TypeUtil.ParameterizedTypeImpl findKeyForParameterizedType(
       ParameterizedType parameterType) {
     Type[] matchingTypes = matchingParameterizedType(parameterType.getActualTypeArguments());
-    return new TypeUtil.ParameterizedTypeImpl(null, parameterType.getRawType(), matchingTypes);
+    return new TypeUtil.ParameterizedTypeImpl(parameterType.getOwnerType(), parameterType.getRawType(), matchingTypes);
   }
 
   /**