diff --git a/block_party_misc/block_party_misc.block_form.inc b/block_party_misc/block_party_misc.block_form.inc
index cf172f3..1addec8 100644
--- a/block_party_misc/block_party_misc.block_form.inc
+++ b/block_party_misc/block_party_misc.block_form.inc
@@ -118,9 +118,18 @@ function block_party_misc_form_customizations_submit($form, &$form_state) {
     $values[$field_name] = ($form_state['values']['block_party_misc'][$field_name]) ? 1 : 0;
   }
 
-  $text_classes = explode(' ', $form_state['values']['block_party_misc_classes_textfield']);
-  $selected_classes = array_keys(array_filter( $form_state['values']['block_party_misc_classes_select']));
-  $values['classes'] = join(' ',array_merge($text_classes, $selected_classes));
+  if (block_party_misc_option_enabled('classes')) {
+      $selected_classes = array_keys(array_filter( $form_state['values']['block_party_misc_classes_select']));
+      if (isset($form_state['values']['block_party_misc_classes_textfield'])) {
+        $text_classes = explode(' ', $form_state['values']['block_party_misc_classes_textfield']);
+
+        $values['classes'] = join(' ',array_merge($text_classes, $selected_classes));
+      }
+      else {
+         $values['classes'] = $selected_classes;
+      }
+  }
+
 
   if (count($values)) {
     block_party_block_update($block_module, $block_delta, $values);
diff --git a/block_party_misc/block_party_misc.fields.inc b/block_party_misc/block_party_misc.fields.inc
index e73a1df..c86bd18 100644
--- a/block_party_misc/block_party_misc.fields.inc
+++ b/block_party_misc/block_party_misc.fields.inc
@@ -43,7 +43,7 @@ function block_party_misc_conf() {
       'schema' => array(
         'type' => 'varchar',
         'length' => '255',
-        'not null' => TRUE,
+        'not null' => FALSE,
         'default' => '',
         'description' => 'String containing the classes for the block.',
        ),
