diff -urpN ../storm/stormexpense/stormexpense.module ./stormexpense/stormexpense.module
--- ../storm/stormexpense/stormexpense.module	2010-10-11 11:40:13.000000000 -0400
+++ ./stormexpense/stormexpense.module	2011-01-10 16:03:36.321121580 -0500
@@ -307,16 +307,16 @@ function stormexpense_form(&$node) {
       }
     }
 
-    if ($_SESSION['stormexpense_list_filter']['organization_nid'] && !$node->organization_nid) {
+    if (isset($_SESSION['stormexpense_list_filter']['organization_nid']) && (!isset($node->organization_nid))) {
       $node->organization_nid = $_SESSION['stormexpense_list_filter']['organization_nid'];
     }
-    if ($_SESSION['stormexpense_list_filter']['project_nid'] && !$node->project_nid) {
+    if (isset($_SESSION['stormexpense_list_filter']['project_nid']) && !isset($node->project_nid)) {
       $node->project_nid = $_SESSION['stormexpense_list_filter']['project_nid'];
     }
-    if ($_SESSION['stormexpense_list_filter']['task_nid'] && !$node->task_nid) {
+    if (isset($_SESSION['stormexpense_list_filter']['task_nid']) && !isset($node->task_nid)) {
       $node->task_nid = $_SESSION['stormexpense_list_filter']['task_nid'];
     }
-    if ($_SESSION['stormexpense_list_filter']['ticket_nid'] && !$node->ticket_nid) {
+    if (isset($_SESSION['stormexpense_list_filter']['ticket_nid']) && !isset($node->ticket_nid)) {
       $node->ticket_nid = $_SESSION['stormexpense_list_filter']['ticket_nid'];
     }
     if (array_key_exists('organization_nid', $_GET)) $node->organization_nid = $_GET['organization_nid'];
@@ -359,9 +359,13 @@ function stormexpense_form(&$node) {
   $s_org = db_rewrite_sql($s_org);
   $r = db_query($s_org);
   $organizations = array();
-  while ($organization = db_fetch_object($r)) {
-    $organizations[$organization->nid] = $organization->title;
-    if (!$node->organization_nid) $node->organization_nid = $organization->nid;
+  if ($r->num_rows > 0 ) {
+    while ($organization = db_fetch_object($r)) {
+      $organizations[$organization->nid] = $organization->title;
+      if (!isset($node->organization_nid)) {
+        $node->organization_nid = $organization->nid;
+      }
+    }
   }
   $form['group1']['organization_nid'] = array(
     '#type' => 'select',
@@ -382,44 +386,50 @@ function stormexpense_form(&$node) {
     $projects[$project->nid] = $project->title;
   }
   $projects = array(0 => '-') + $projects;
-  $form['group1']['project_nid'] = array(
-    '#type' => 'select',
-    '#title' => t('Project'),
-    '#default_value' => $node->project_nid,
-    '#options' => $projects,
-    '#process' => array('storm_dependent_select_process'),
-    '#attributes' => array('onchange' => "stormticket_project_task_tickets(this, 'edit-organization-nid', 'edit-task-nid', 'edit-ticket-nid', true, '-')"),
-  );
-
-  $tree = _stormtask_get_tree($node->project_nid);
-  $tasks = _stormtask_plain_tree($tree);
-  $tasks = array(0 => '-') + $tasks;
-  $form['group1']['task_nid'] = array(
-    '#type' => 'select',
-    '#title' => t('Task'),
-    '#default_value' => $node->task_nid,
-    '#options' => $tasks,
-    '#process' => array('storm_dependent_select_process'),
-    '#attributes' => array('onchange' => "stormticket_task_tickets(this, 'edit-organization-nid', 'edit-project-nid', 'edit-ticket-nid', true, '-')"),
-  );
-
+  if (isset($node->project_nid)) {
+    $form['group1']['project_nid'] = array(
+      '#type' => 'select',
+      '#title' => t('Project'),
+      '#default_value' => $node->project_nid,
+      '#options' => $projects,
+      '#process' => array('storm_dependent_select_process'),
+      '#attributes' => array('onchange' => "stormticket_project_task_tickets(this, 'edit-organization-nid', 'edit-task-nid', 'edit-ticket-nid', true, '-')"),
+    );
+  
+    $tree = _stormtask_get_tree($node->project_nid);
+    $tasks = _stormtask_plain_tree($tree);
+    $tasks = array(0 => '-') + $tasks;
+    $form['group1']['task_nid'] = array(
+      '#type' => 'select',
+      '#title' => t('Task'),
+      '#default_value' => $node->task_nid,
+      '#options' => $tasks,
+      '#process' => array('storm_dependent_select_process'),
+      '#attributes' => array('onchange' => "stormticket_task_tickets(this, 'edit-organization-nid', 'edit-project-nid', 'edit-ticket-nid', true, '-')"),
+    );
+  }
   $tickets = array();
   $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormticket} AS sti ON sti.vid=n.vid WHERE n.status=1 AND n.type='stormticket'
   AND sti.organization_nid=%d AND sti.project_nid=%d AND sti.task_nid=%d ORDER BY n.title";
   $s = stormticket_access_sql($s);
   $s = db_rewrite_sql($s);
-  $r = db_query($s, $node->organization_nid, $node->project_nid, $node->task_nid);
-  while ($ticket = db_fetch_object($r)) {
-    $tickets[$ticket->nid] = $ticket->title;
+  if (isset($node->organization_nid) && isset($node->project_nid) && isset($node->task_nid)) {
+    $r = db_query($s, $node->organization_nid, $node->project_nid, $node->task_nid);
+  }
+  if ($r->num_rows > 0 ) {
+    while ($ticket = db_fetch_object($r)) {
+      $tickets[$ticket->nid] = $ticket->title;
+    }
+  }
+  if (isset($node->ticket_nid)) {
+    $form['group1']['ticket_nid'] = array(
+      '#type' => 'select',
+      '#title' => t('Ticket'),
+      '#default_value' => $node->ticket_nid,
+      '#options' => array(0 => '-') + $tickets,
+      '#process' => array('storm_dependent_select_process'),
+    );
   }
-  $form['group1']['ticket_nid'] = array(
-    '#type' => 'select',
-    '#title' => t('Ticket'),
-    '#default_value' => $node->ticket_nid,
-    '#options' => array(0 => '-') + $tickets,
-    '#process' => array('storm_dependent_select_process'),
-  );
-
   $form['group2'] = array(
     '#type' => 'markup',
     '#theme' => 'storm_form_group',
@@ -431,14 +441,15 @@ function stormexpense_form(&$node) {
     '#title' => t('Date'),
     '#default_value' => _storm_gmtimestamp_to_date($node->expensedate),
   );
-
-  $form['group2']['provider_title'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Provider'),
-    '#size' => 50,
-    '#default_value' => $node->provider_title,
-    '#autocomplete_path' => 'storm/expenses/provider_autocomplete',
-  );
+  if (isset($node->provider_title)) {
+    $form['group2']['provider_title'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Provider'),
+      '#size' => 50,
+      '#default_value' => $node->provider_title,
+      '#autocomplete_path' => 'storm/expenses/provider_autocomplete',
+    );
+  }
   
   $form['group3'] = array(
     '#type' => 'markup',
@@ -446,12 +457,14 @@ function stormexpense_form(&$node) {
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : -18,
   );
   
-  $form['group3']['amount'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Amount'),
-    '#default_value' => $node->amount,
-    '#size' => 15,
-  );
+  if (isset($node->amount)) {
+    $form['group3']['amount'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Amount'),
+      '#default_value' => $node->amount,
+      '#size' => 15,
+    );
+  }
 
   $form['group4'] = array(
     '#type' => 'markup',
diff -urpN ../storm/stormexpense/stormexpense.test ./stormexpense/stormexpense.test
--- ../storm/stormexpense/stormexpense.test	1969-12-31 19:00:00.000000000 -0500
+++ ./stormexpense/stormexpense.test	2011-01-10 15:58:36.751100000 -0500
@@ -0,0 +1,38 @@
+<?php
+class StormexpenseTestCase extends DrupalWebTestCase {
+
+  public static function getInfo() {
+    return array(
+      'name' => t('Storm Expense Functionality'),
+      'description' => t('Test the functionality of the Storm Expense module'),
+      'group' => 'Storm',
+    );
+  }
+
+  public function setUp() {
+    parent::setUp('storm', 'stormattribute', 'stormorganization', 'stormproject', 'stormtask', 'stormexpense');
+  }
+
+  public function testStormexpenseCreate() {
+    // Create and login user
+    $user = $this->drupalCreateUser(array('Storm organization: add', 'Storm organization: view all', 'Storm expense: add', 'Storm expense: view all', 'Storm project: view all', 'Storm task: view all'));
+    $this->drupalLogin($user);
+
+    // Create a team
+    $org = array(
+      'title' => $this->randomName(32),
+    );
+
+    $expense = array(
+      'organization_nid' => '1',
+      'title' => $this->randomName(32),
+    );
+
+    $this->drupalPost('node/add/stormorganization', $org, t('Save'));
+
+    $this->drupalPost('node/add/stormexpense', $expense, t('Save'));
+
+    $this->assertText(t('Expense @title has been created.', array('@title' => $expense['title'])));
+  }
+}
+