diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index df78c7adf86..54bedcb8d95 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1185,14 +1185,14 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
     	VMTemplateVO iso = _tmpltDao.findById(isoId);
 
         boolean success = _vmMgr.attachISOToVM(vmId, isoId, attach);
-        
-        if (attach) {
-            vm.setIsoId(iso.getId());
-        } else {
-            vm.setIsoId(null);
-        }
-        _userVmDao.update(vmId, vm);
-        
+        if ( success ) {
+            if (attach) {
+                vm.setIsoId(iso.getId());
+            } else {
+                vm.setIsoId(null);
+            }
+            _userVmDao.update(vmId, vm);
+        }       
         return success;
     }