Index: uc_option_image.module
===================================================================
--- uc_option_image.module	(revision 1241)
+++ uc_option_image.module	(working copy)
@@ -31,6 +31,11 @@
 function uc_option_image_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
   switch ($op) {
     case 'load':  
+    	
+      if (!uc_product_node_is_product($node->type))
+      {
+      	return;
+      }
       // Load option images
       // Keep in mind the file 'filename' is a mash of nid/aid/oid
       $node->option_images = array();
@@ -60,7 +65,11 @@
       break;
       
     case 'view':
-      // @todo issue being invoked so many times?
+      if (!uc_product_node_is_product($node->type))
+      {
+      	return;
+      }
+    	// @todo issue being invoked so many times?
       // @todo refactor
       if (isset($node->content['add_to_cart'])){ 
         if (user_access('view option images')){