diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index aff8d2da938..82972dfdf48 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -664,12 +664,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
         Transaction txn = Transaction.currentTxn();
         txn.start();
         // Create an event
-        long templateId = -1;
-        long diskOfferingId = -1;
-        if(originalVolume.getTemplateId() != null){
-            templateId = originalVolume.getTemplateId();
-        }
-        diskOfferingId = originalVolume.getDiskOfferingId();
+        Long templateId = originalVolume.getTemplateId();;
+        Long diskOfferingId = originalVolume.getDiskOfferingId();
         long sizeMB = createdVolume.getSize()/(1024*1024);
 
         if (createdVolume.getPath() != null) {
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 66cdc2cada8..78a1c9d713f 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1123,12 +1123,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         for (VolumeVO volume : volumes) {
         	_volsDao.recoverVolume(volume.getId());
             // Create an event
-            long templateId = -1;
-            long diskOfferingId = -1;
-            if(volume.getTemplateId() !=null){
-                templateId = volume.getTemplateId();
-            }
-            diskOfferingId = volume.getDiskOfferingId();
+            Long templateId = volume.getTemplateId();
+            Long diskOfferingId = volume.getDiskOfferingId();
             long sizeMB = volume.getSize()/(1024*1024);
             StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
             EventUtils.saveEvent(User.UID_SYSTEM, volume.getAccountId(), EventTypes.EVENT_VOLUME_CREATE, "Created volume: "+ volume.getName() +" with size: " + sizeMB + " MB in pool: " + pool.getName());