--- image_attach.module	Fri Mar  2 18:22:54 2007
+++ image_attach.module.new	Fri Mar  2 18:22:40 2007
@@ -159,9 +159,11 @@ function image_attach_nodeapi(&$node, $o
       break;
     case 'insert':
     case 'update':
-      if ($node->iid) {
+      if (isset($node->iid)) {
         db_query("DELETE FROM {image_attach} WHERE nid=%d", $node->nid);
-        db_query("INSERT INTO {image_attach} (nid, iid) VALUES (%d, %d)", $node->nid, $node->iid);
+        if ($node->iid > 0) {
+          db_query("INSERT INTO {image_attach} (nid, iid) VALUES (%d, %d)", $node->nid, $node->iid);
+        }
       }
       break;
     case 'delete':
@@ -192,7 +194,7 @@ function image_attach_nodeapi(&$node, $o
  * Fetch an array of all candidate referenced nodes, for use in presenting the selection form to the user.
  */
 function _image_attach_get_image_nodes() {
-  $rows = array(0 => '');
+  $rows = array(0 => 'None');
   $result = db_query(db_rewrite_sql("SELECT n.nid, n.title FROM {node} n WHERE n.status=1 AND type='image' ORDER BY n.sticky DESC, n.title ASC"));
   if (db_num_rows($result) == 0) {
       return array();