diff --git a/project_issue_availability.module b/project_issue_availability.module
index edecbb2..a0cd2fc 100644
--- a/project_issue_availability.module
+++ b/project_issue_availability.module
@@ -139,7 +139,7 @@ function project_issue_availability_user_form($form_state, $account) {
     '#type' => 'textfield',
     '#size' => '2',
     '#maxlength' => '2',
-    '#default_value' => $config->max,
+    '#default_value' => isset($config->max) ? $config->max : '',
     '#description' => t('Enter the maximum number of issue to be assigned at one time, or leave blank for no limit.'),
   );
 
@@ -152,20 +152,20 @@ function project_issue_availability_user_form($form_state, $account) {
 
   // Using the fieldset is usability hack around the fact that the 'date' field
   // type does not have null options, so we just hide when not relevant.
+  $hiatus_timestamp = isset($config->hiatus) ? $config->hiatus : NULL;
   $form['fieldset'] = array(
     '#title' => $desc,
     '#type' => 'fieldset',
     '#collapsible' => TRUE,
-    '#collapsed' => $config->hiatus < time(),
+    '#collapsed' => !isset($hiatus_timestamp) || ($hiatus_timestamp < time()),
   );
 
-  $ts = $config->hiatus;
   $form['fieldset']['hiatus'] = array(
     '#title' => t('Hiatus'),
     '#type' => 'date',
-    '#default_value' => array('year' => date('Y', $ts),
-                              'month' => date('n', $ts),
-                              'day' => date('j', $ts),
+    '#default_value' => array('year' => date('Y', $hiatus_timestamp),
+                              'month' => date('n', $hiatus_timestamp),
+                              'day' => date('j', $hiatus_timestamp),
                              ),
   );