Index: acidfree.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acidfree/acidfree.module,v
retrieving revision 1.147.2.42
diff -u -d -r1.147.2.42 acidfree.module
--- acidfree.module	14 Feb 2011 20:58:17 -0000	1.147.2.42
+++ acidfree.module	14 Feb 2011 21:12:57 -0000
@@ -633,9 +633,12 @@
 
 function _acidfree_album_is_shared($option) {
     global $user;
-    $tid = array_keys($option->option);
-    $node = _album_from_tid($tid[0]);
-    return ($node->share || $node->uid == $user->uid);
+    if (isset($option) && is_object($option)) {
+    	$tid = array_keys($option->option);
+    	$node = _album_from_tid($tid[0]);
+        return ($node->share || $node->uid == $user->uid);
+    }
+    return FALSE;
 }
 
 function _acidfree_filter_taxonomy(&$taxonomy) {
@@ -659,7 +662,7 @@
   $nodes_to_check = array();
   switch ($form_id) {
     case 'acidfree_node_form':
-        $pid = array_pop(explode('/',$_GET['q']));
+        $pid = _path_match('node', 'add', 'acidfree', '%d');
         _acidfree_node_form_alter($form, $form_state, $pid);
         break;
     case 'system_modules':
Index: types/acidfree_image/acidfree_image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acidfree/types/acidfree_image/acidfree_image.module,v
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.9 acidfree_image.module
--- types/acidfree_image/acidfree_image.module	12 Feb 2011 12:47:10 -0000	1.1.2.9
+++ types/acidfree_image/acidfree_image.module	14 Feb 2011 21:12:57 -0000
@@ -120,10 +120,10 @@
 
     $vid = acidfree_get_vocab_id();
 
+    _acidfree_filter_taxonomy($form['taxonomy'][$vid]);
     if (_path_match('node', 'add', 'image', '%d')) {
         $album = acidfree_node_load(arg(3));
         $form['taxonomy'][$vid]['#default_value'] = array($album->tid);
-        _acidfree_filter_taxonomy($form['taxonomy'][$vid]);
 	    if (variable_get('acidfree_disable_album_selection', true)) {
             $form['taxonomy'][$vid]['#prefix'] = '<div style="display:none">';
             $form['taxonomy'][$vid]['#suffix'] = '</div>';