Index: metadata/class.c
===================================================================
--- metadata/class.c    (revision 81651)
+++ metadata/class.c    (working copy)
@@ -2688,6 +2688,11 @@
        class->inited = 1;
        class->init_pending = 0;
 
+       if (mono_loader_get_last_error ()) {
+               g_assert (class->exception_type != MONO_EXCEPTION_NONE);
+               mono_loader_clear_error ();
+       }
+
        mono_loader_unlock ();
 
        if (mono_debugger_class_init_func)