diff --git a/commerce.module b/commerce.module
index c23edc2..74ccab0 100755
--- a/commerce.module
+++ b/commerce.module
@@ -971,9 +971,14 @@ function commerce_simplexml_add_children(&$simplexml_element, $child_data) {
  *
  * @see entity_access()
  */
-function commerce_entity_access($op, $entity, $account, $entity_type) {
+function commerce_entity_access($op, $entity, $account = NULL, $entity_type = NULL) {
   global $user;
-  $account = isset($account) ? $account : $user;
+  $account = !empty($account) ? $account : $user;
+
+  if (empty($entity_type)) {
+    watchdog('commerce', 'commerce_entity_access called without providing entity_type', array(), WATCHDOG_NOTICE);
+    return FALSE;
+  }
 
   $entity_info = entity_get_info($entity_type);