diff --git a/init.go b/init.go
index d16b24a..5e2b840 100644
--- a/init.go
+++ b/init.go
@@ -118,8 +118,6 @@
 	}
 	config.Set(configApidInstanceID, apidInfo.InstanceID)
 
-	tokenManager = createTokenManager()
-
 	log.Debug("end init")
 
 	return pluginData, nil
@@ -156,6 +154,8 @@
 
 		log.Debug("start post plugin init")
 
+		tokenManager = createTokenManager()
+
 		go bootstrap()
 
 		events.Listen(ApigeeSyncEventSelector, &handler{})
diff --git a/mock_server.go b/mock_server.go
index 4e0c3ca..71b6d97 100644
--- a/mock_server.go
+++ b/mock_server.go
@@ -442,6 +442,7 @@
 			target(w, req)
 		})
 		if len(errors) > 0 {
+			log.Errorf("assertion errors for %s:\nheaders:%v\n%v", req.URL, req.Header, errors)
 			w.WriteHeader(http.StatusBadRequest)
 			w.Write([]byte(fmt.Sprintf("assertion errors:\n%v", errors)))
 		}