diff --git a/src/class_linker.cc b/src/class_linker.cc
index d28d729..75f0f38 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -2355,8 +2355,8 @@
   }
   {
     ObjectLock lock(self, klass.get());  // Must hold lock on object when initializing.
-    interfaces_sfield->SetObject(NULL, interfaces);
-    throws_sfield->SetObject(NULL, throws);
+    interfaces_sfield->SetObject(klass.get(), interfaces);
+    throws_sfield->SetObject(klass.get(), throws);
     klass->SetStatus(Class::kStatusInitialized);
   }