diff --git a/uc_node_checkout.module b/uc_node_checkout.module
index 5ab7a90..6169c1d 100644
--- a/uc_node_checkout.module
+++ b/uc_node_checkout.module
@@ -875,7 +875,7 @@ function uc_node_checkout_product_map($type = '') {
   }
 
   // If we passed in a node type, return that node type's product nid.
-  if (!empty($type)) {
+  if (!empty($type) && !empty($nc_map[$type])) {
     return $nc_map[$type];
   }
 
@@ -894,7 +894,7 @@ function uc_node_checkout_product_map($type = '') {
 function uc_node_checkout_node_associated($node) {
   // Return TRUE if a product node has been associated to this node type.
   if ($nc_map = uc_node_checkout_product_map($node->type)) {
-    if ($nc_map['nid'] || $nc_map['view']) {
+    if (!empty($nc_map['nid']) || !empty($nc_map['view'])) {
       return TRUE;
     }
   }