diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index a5edca9d472..4056cd8147c 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1095,7 +1095,9 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
     @Override
     public void finalizeStop(VirtualMachineProfile<DomainRouterVO> profile, StopAnswer answer) {
         if (answer != null) {
-            processStopOrRebootAnswer(profile.getVirtualMachine(), answer);
+            VMInstanceVO vm = profile.getVirtualMachine();
+            DomainRouterVO domR = _routerDao.findById(vm.getId());
+            processStopOrRebootAnswer(domR, answer);
         }
     }
     
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 3e8ee037aef..3eedfa8e2d5 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2287,7 +2287,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
     
     @Override
     public void finalizeStop(VirtualMachineProfile<UserVmVO> profile, StopAnswer answer) {
-		UserVmVO vm = profile.getVirtualMachine();
+		VMInstanceVO vm = profile.getVirtualMachine();
         UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VM_STOP, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getName(), vm.getServiceOfferingId(), vm.getTemplateId(), null);
         _usageEventDao.persist(usageEvent);