diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java
index 8ac2844cd1b..80a9386e4f4 100644
--- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java
+++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java
@@ -190,7 +190,7 @@ public class NiciraNvpResource implements ServerResource {
         ClusterRoleConfig[] configuredRoles = ccs.getConfiguredRoles();
         if (configuredRoles != null){
             String apiProviderMajorityVersion = searchApiProvider(configuredRoles);
-            NiciraNvpApiVersion.pingNiciraApiVersion(apiProviderMajorityVersion);
+            NiciraNvpApiVersion.setNiciraApiVersion(apiProviderMajorityVersion);
             NiciraNvpApiVersion.logNiciraApiVersion();
         }
     }
diff --git a/utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java b/utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java
index b2d6e163b47..4dfd4e2b62a 100755
--- a/utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java
+++ b/utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java
@@ -26,34 +26,19 @@ import com.cloud.maint.Version;
 public class NiciraNvpApiVersion {
     private static final Logger s_logger = Logger.getLogger(NiciraNvpApiVersion.class);
 
-    private static String niciraApiVersion = null;
+    private static String niciraApiVersion;
 
-    public static void pingNiciraApiVersion(String apiVersion){
-        if (apiVersion == null){
-            niciraApiVersion = null;
-        }
-        else{
-            if (niciraApiVersion == null){
-                setNiciraApiVersion(apiVersion);
-            }
-            else {
-                if (! apiVersion.equals(niciraApiVersion)){
-                    setNiciraApiVersion(apiVersion);
-                }
-            }
-        }
-    }
-
-    private static void setNiciraApiVersion(String apiVersion){
+    public static synchronized void setNiciraApiVersion(String apiVersion){
         niciraApiVersion = apiVersion;
     }
 
-    public static boolean isApiVersionLowerThan(String apiVersion){
+    public static synchronized boolean isApiVersionLowerThan(String apiVersion){
+        if (niciraApiVersion == null) return false;
         int compare = Version.compare(niciraApiVersion, apiVersion);
         return (compare < 0);
     }
 
-    public static void logNiciraApiVersion(){
+    public static synchronized void logNiciraApiVersion(){
         s_logger.info("NSX API VERSION: " + ((niciraApiVersion != null) ? niciraApiVersion : " NOT PRESENT"));
     }
 
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
index 204b1cd828f..3d62fdcd16b 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
@@ -103,7 +103,6 @@ public class VmwareHelper {
             break;
 
         default:
-            assert (false);
             nic = new VirtualE1000();
         }