--- plugins.orig/mac/PluginPackageMac.cpp	2008-11-13 10:35:37.000000000 -0500
+++ plugins/mac/PluginPackageMac.cpp	2008-11-13 16:46:20.000000000 -0500
@@ -271,11 +271,6 @@
     memset(&m_pluginFuncs, 0, sizeof(m_pluginFuncs));
     m_pluginFuncs.size = sizeof(m_pluginFuncs);
 
-    npErr = NP_GetEntryPoints(&m_pluginFuncs);
-    LOG_NPERROR(npErr);
-    if (npErr != NPERR_NO_ERROR)
-        goto abort;
-
     m_browserFuncs.size = sizeof (m_browserFuncs);
     m_browserFuncs.version = NP_VERSION_MINOR;
     m_browserFuncs.geturl = NPN_GetURL;
@@ -326,6 +321,12 @@
     npErr = NP_Initialize(&m_browserFuncs, &m_pluginFuncs);
 #else
     npErr = NP_Initialize(&m_browserFuncs);
+
+    if (npErr != NPERR_NO_ERROR)
+        goto abort;
+
+    npErr = NP_GetEntryPoints(&m_pluginFuncs);
+    LOG_NPERROR(npErr);
 #endif
     if (npErr != NPERR_NO_ERROR)
         goto abort;