diff --git a/pom.xml b/pom.xml
index a7c2099051a..7da07519fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,6 @@
     <module>test</module>
     <module>client</module>
     <module>services</module>
-    <module>tools</module>
   </modules>
 
   <dependencyManagement>
@@ -511,9 +510,7 @@
       </properties>
       <modules>
         <module>developer</module>
-        <!--
         <module>tools</module>
--->
       </modules>
     </profile>
     <profile>
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 354b3abdf37..1cb2f91198a 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2470,9 +2470,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         if( info.hvtoolsversion != null && !info.hvtoolsversion.isEmpty() ) {
 
             UserVmVO userVm = _userVmDao.findById(vm.getId());
-            _userVmDao.loadDetails(userVm);
-            userVm.setDetail("hypervisortoolsversion",  info.hvtoolsversion);
-            _userVmDao.saveDetails(userVm);
+            if (userVm != null) {
+                _userVmDao.loadDetails(userVm);
+                userVm.setDetail("hypervisortoolsversion",  info.hvtoolsversion);
+                _userVmDao.saveDetails(userVm);
+            }
         }
 
         if (trackExternalChange) {