diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bb45c71eb..84ad483ce 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -8,7 +8,9 @@ fpath=($ZSH/functions $fpath)
 for config_file ($ZSH/lib/*.zsh) source $config_file
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH/custom/*.zsh) source $config_file
+if [ -d "$ZSH/custom" ]; then
+  for config_file ($ZSH/custom/*.zsh) source $config_file
+fi
 
 # Load all of the plugins that were defined in ~/.zshrc
 plugin=${plugin:=()}
@@ -22,4 +24,4 @@ else
   /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
 fi
 
-unset config_file
\ No newline at end of file
+unset config_file