diff --git a/micro.module b/micro.module
index 877bba3..d222902 100755
--- a/micro.module
+++ b/micro.module
@@ -2079,8 +2079,10 @@ function _micro_entity_view($entity, $eid, $view_mode) {
 function _micro_entity_delete($entity_name, $entity_type, $eid) {
   $types = micro_types_from_entity($entity_name, $entity_type);
   //TODO - not sure conditions accept arrays
-  foreach (micro_load_multiple(FALSE, array('mtid' => array_keys($types), 'eid' => $eid)) as $micro) {
+  if (!empty($types)) {
+    foreach (micro_load_multiple(FALSE, array('mtid' => array_keys($types), 'eid' => $eid)) as $micro) {
      micro_delete($micro);
+    }
   }
 }
 
diff --git a/micro.pages.inc b/micro.pages.inc
index 079591f..48405b6 100644
--- a/micro.pages.inc
+++ b/micro.pages.inc
@@ -257,7 +257,7 @@ function micro_delete_confirm_submit($form, &$form_state) {
   if ($form_state['values']['confirm']) {
     $micro = micro_load($form_state['values']['mid']);
     $micro_type = micro_type_get_type($micro);
-    micro_delete($form_state['values']['mid']);
+    micro_delete($micro);
     watchdog('content', '@type: deleted %mid.', array('@type' => $micro_type->machine_name, '%mid' => $micro->mid));
     drupal_set_message(t('@type %mid has been deleted.', array('@type' => $micro_type->name, '%mid' => $micro->mid)));
   }