diff --git a/README.md b/README.md
index 136704c..9e626cb 100644
--- a/README.md
+++ b/README.md
@@ -21,3 +21,5 @@ Just source the script from your `~/.zshrc`.
  * [Jonathan Dahan](http://github.com/jedahan)
  * James Ahlborn
  * [Andreas Jaggi](http://github.com/x-way)
+ * [Wayne Davison](http://github.com/WayneD)
+ 
diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh
index 1d21e88..478c4e1 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -61,7 +61,7 @@ colorize-zle-buffer() {
 	esac
     fi
     region_highlight+=("$start_pos $end_pos $style")
-    [[ ${${ZLE_TOKENS_FOLLOWED_BY_COMMANDS[(r)${arg//|/\|}]}:+yes} = 'yes' ]] && colorize=true
+    [[ ${${ZLE_TOKENS_FOLLOWED_BY_COMMANDS[(r)${arg//|/\|}]:-}:+yes} = 'yes' ]] && colorize=true
     start_pos=$end_pos
   done
 }