diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
index 9b5f9afe3f6..25d64e8d891 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -62,6 +62,7 @@ public interface Volume extends ControlledEntity, BasedOn, StateObject<Volume.St
             s_fsm.addTransition(Allocated, Event.UploadRequested, Uploading);
             s_fsm.addTransition(Uploading, Event.UploadSucceeded, Uploaded);
             s_fsm.addTransition(Uploading, Event.OperationFailed, UploadError);
+            s_fsm.addTransition(UploadError, Event.DestroyRequested, Destroy);
             s_fsm.addTransition(Uploaded, Event.UploadSucceeded, Uploaded);
             s_fsm.addTransition(Uploaded, Event.CopyRequested, Creating);
             s_fsm.addTransition(Uploaded, Event.DestroyRequested, Destroy);
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index da602852329..1b7737f906f 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -198,7 +198,7 @@ public class ConfigurationServerImpl implements ConfigurationServer {
             createdefaultDiskOffering(null, "Medium", "Medium Disk, 20 GB", 20, null, false, false);
             createdefaultDiskOffering(null, "Large", "Large Disk, 100 GB", 100, null, false, false);
             createdefaultDiskOffering(null, "Large", "Large Disk, 100 GB", 100, null, false, false);
-            createdefaultDiskOffering(null, "Custom", "Custom Disk", 0, null, true, true);
+            createdefaultDiskOffering(null, "Custom", "Custom Disk", 0, null, true, false);
 
             // Save the mount parent to the configuration table
             String mountParent = getMountParent();
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 9649b08853a..7be946b2849 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -3374,13 +3374,18 @@ public class StorageManagerImpl implements StorageManager, Manager, ClusterManag
         //Find out if the volume is present on secondary storage
         VolumeHostVO volumeHost = _volumeHostDao.findByVolumeId(vol.getId());
         if(volumeHost != null){
-        	HostVO ssHost = _hostDao.findById(volumeHost.getHostId());
-        	DeleteVolumeCommand dtCommand = new DeleteVolumeCommand(ssHost.getStorageUrl(), volumeHost.getInstallPath());            
-        	Answer answer = _agentMgr.sendToSecStorage(ssHost, dtCommand);
-             if (answer == null || !answer.getResult()) {
-                 s_logger.debug("Failed to delete " + volumeHost + " due to " + ((answer == null) ? "answer is null" : answer.getDetails()));
-                 return;
-             }
+        	if (volumeHost.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED){
+        		HostVO ssHost = _hostDao.findById(volumeHost.getHostId());
+        		DeleteVolumeCommand dtCommand = new DeleteVolumeCommand(ssHost.getStorageUrl(), volumeHost.getInstallPath());            
+        		Answer answer = _agentMgr.sendToSecStorage(ssHost, dtCommand);
+        		if (answer == null || !answer.getResult()) {
+        			s_logger.debug("Failed to delete " + volumeHost + " due to " + ((answer == null) ? "answer is null" : answer.getDetails()));
+        			return;
+        		}
+        	}else if(volumeHost.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_IN_PROGRESS){									
+					s_logger.debug("Volume: " + vol.getName() + " is currently being uploaded; cant' delete it.");
+					throw new CloudRuntimeException("Please specify a volume that is not currently being uploaded.");
+        	}
             _volumeHostDao.remove(volumeHost.getId());
             _volumeDao.remove(vol.getId());
             return;             
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index 8501fd224ef..fb42f4fffbb 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -744,8 +744,16 @@ public class DownloadMonitorImpl implements  DownloadMonitor {
                 	volumeHost.setSize(volInfo.getSize());
                 	volumeHost.setPhysicalSize(volInfo.getPhysicalSize());
                 	volumeHost.setLastUpdated(new Date());
+                	if (volume.getState() == Volume.State.Uploading){
+                		try {
+                			_storageMgr.stateTransitTo(volume, Event.UploadSucceeded);			
+                		} catch (NoTransitionException e) {
+                			e.printStackTrace();
+                		}
+                	}
+                
+                	_volumeHostDao.update(volumeHost.getId(), volumeHost);
                 }
-                _volumeHostDao.update(volumeHost.getId(), volumeHost);                
         	}
         }