diff --git a/textformatter.module b/textformatter.module
index 67a8774..132afcd 100755
--- a/textformatter.module
+++ b/textformatter.module
@@ -323,9 +323,14 @@ function theme_textformatter_comma($variables) {
   //Override if we need to.
   if ($settings['textformatter_comma_override']) {
     $sep = check_plain($settings['textformatter_separator_custom']);
-    $tag = $settings['textformatter_separator_custom_tag'];
-    $class = $settings['textformatter_separator_custom_class'];
-    $separator = "<$tag class=\"$class\">$sep</$tag>";
+    if (!empty($settings['textformatter_separator_custom_tag'])) {
+      $tag = $settings['textformatter_separator_custom_tag'];
+      $class = $settings['textformatter_separator_custom_class'];
+      $separator = "<$tag class=\"$class\">$sep</$tag>";
+    }
+    else{
+      $separator = $sep;
+    }
   }
   // Generate a comma-separated list.
   $output = implode($separator, $items) . $last;