diff --git a/pmnote/pmnote.module b/pmnote/pmnote.module
index 96e6cfb..820b2e2 100644
--- a/pmnote/pmnote.module
+++ b/pmnote/pmnote.module
@@ -294,7 +294,7 @@ function pmnote_form(&$node, $form_state) {
   $form['group1']['organization_nid'] = array(
     '#type' => 'select',
     '#title' => t('Organization'),
-    '#default_value' => $node->organization_nid,
+    '#default_value' => isset($node->organization_nid) ? $node->organization_nid : NULL,
     '#options' => $organizations,
     '#required' => TRUE,
     '#ajax' => array(
@@ -303,7 +303,13 @@ function pmnote_form(&$node, $form_state) {
     ),
   );
 
-  $organization_nid = isset($form_state['values']['organization_nid']) ? $form_state['values']['organization_nid'] : $node->organization_nid;
+  if (isset($node->organization_nid)) {
+    $organization_nid = isset($form_state['values']['organization_nid']) ? $form_state['values']['organization_nid'] : $node->organization_nid;
+  }
+  else {
+    drupal_set_message(t('Please add an organization to the system before trying to add a note'), 'error');
+    $organization_nid = NULL;
+  }
 
   $pro_query = db_select('node', 'n');
   $pro_query->join('pmproject', 'spr', 'n.vid = spr.vid');
diff --git a/pmticket/pmticket.module b/pmticket/pmticket.module
index 80e0d7b..a2d7684 100644
--- a/pmticket/pmticket.module
+++ b/pmticket/pmticket.module
@@ -442,10 +442,13 @@ function pmticket_form(&$node) {
       $node->organization_nid = $organization->nid;
     }
   }
+  if (!isset($node->organization_nid)) {
+    drupal_set_message(t('Please add an organization to the system before trying to add a ticket.'), 'error');
+  }
   $form['group1']['organization_nid'] = array(
     '#type' => 'select',
     '#title' => t('Organization'),
-    '#default_value' => $node->organization_nid,
+    '#default_value' => isset($node->organization_nid) ? $node->organization_nid : NULL,
     '#options' => $organizations,
     '#required' => TRUE,
     '#attributes' => array('onchange' => "pmtask_organization_project_tasks(this, 'edit-project-nid', 'edit-parent-nid', 'edit-assigned-nid', true, '-')"),
@@ -455,7 +458,7 @@ function pmticket_form(&$node) {
   $pro_query->join('pmproject', 'spr', 'n.vid = spr.vid');
   $pro_result = $pro_query
     ->fields('n', array('nid', 'title'))
-    ->condition('spr.organization_nid', $node->organization_nid)
+    ->condition('spr.organization_nid', isset($node->organization_nid) ? $node->organization_nid : NULL)
     ->condition('n.status', 1)
     ->condition('n.type', 'pmproject')
     ->orderBy('n.title', 'ASC')