diff --git a/inc/core.de.php b/inc/core.de.php
index 0e2fa10..3e26c80 100755
--- a/inc/core.de.php
+++ b/inc/core.de.php
@@ -32,12 +32,12 @@ function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0)
 
         if ($depth != 0) $description = "";
 
-        $item_output = $args->before;
+        $item_output = (isset ($args->before)) ? $args->before : '';
         $item_output .= '<a' . $attributes . '>';
-        $item_output .= $args->link_before . apply_filters('the_title', $item->title, $item->ID);
-        $item_output .= $description . $args->link_after;
+        if (isset ($args->link_before)) $item_output .= $args->link_before . apply_filters('the_title', $item->title, $item->ID);
+        if (isset ($args->link_after)) $item_output .= $description . $args->link_after;
         $item_output .= '</a>';
-        $item_output .= $args->after;
+        if (isset ($args->after)) $item_output .= $args->after;
 
         $output .= apply_filters('walker_nav_menu_start_el', $item_output, $item, $depth, $args);
     }