diff --git a/extras/forms/mcapi_forms.tokens.inc b/extras/forms/mcapi_forms.tokens.inc
index b2e73df..0527d48 100644
--- a/extras/forms/mcapi_forms.tokens.inc
+++ b/extras/forms/mcapi_forms.tokens.inc
@@ -34,7 +34,7 @@ function mcapi_forms_tokens($type, $tokens, array $objects, array $options = arr
     }
     if (isset($element['#children']) && strlen($element['#children'])) continue;//have already been rendered (and replaced, above)
     //hide all the unused form elements
-    if ($element['#type'] == 'container') {//so its probably a fieldAPI field
+    if (!empty($element['#type']) && $element['#type'] == 'container') {//so its probably a fieldAPI field
       $element['#access'] = FALSE;
     }
     $replacements[$original] .= drupal_render($element);
diff --git a/extras/limits/mcapi_limits.module b/extras/limits/mcapi_limits.module
index fa9f708..8743c77 100644
--- a/extras/limits/mcapi_limits.module
+++ b/extras/limits/mcapi_limits.module
@@ -68,7 +68,7 @@ function mcapi_limits_accounting_validate(array $cluster) {
       //check to see if any of the skip settings apply.
       //these check, or at least these reports should possiblly be done after the check, and only if the check failed
       $currency = currency_load($currcode);
-      if ($currency->display['issuance'] == 'acknowledgement') continue;
+      if (!empty($currency->display['issuance']) && $currency->display['issuance'] == 'acknowledgement') continue;
       //upgraded sites need to check for the presence of the skip property
       $skips = isset($currency->limits['skip']) ? $currency->limits['skip'] : array('user1' => 0, 'owner' => 0, 'auto' => 0, 'reservoir' => 0 );
       if ($skips['user1'] && $GLOBALS['user']->uid == 1) {
@@ -400,4 +400,4 @@ function trading_limits_view($uid, $currcodes = array()) {
     }
   }
   return $renderable;
-}
\ No newline at end of file
+}