diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index f8a20d0..fa50324 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1684,6 +1684,7 @@
 }
 
 void ClassLinker::FixupStaticTrampolines(mirror::Class* klass) {
+  DCHECK(klass->IsInitialized()) << PrettyDescriptor(klass);
   if (klass->NumDirectMethods() == 0) {
     return;  // No direct methods => no static methods.
   }
@@ -3159,9 +3160,6 @@
     }
   }
 
-  // Opportunistically set static method trampolines to their destination.
-  FixupStaticTrampolines(klass.get());
-
   uint64_t t1 = NanoTime();
 
   bool success = true;
@@ -3185,6 +3183,8 @@
         ClassHelper kh(klass.get());
         LOG(INFO) << "Initialized class " << kh.GetDescriptor() << " from " << kh.GetLocation();
       }
+      // Opportunistically set static method trampolines to their destination.
+      FixupStaticTrampolines(klass.get());
     }
   }
   return success;