diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index 6003a48..eda83bf 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -37,7 +37,7 @@ function git(){
   esac
 }
 
-_alias $git_alias='git'
+_alias "$git_alias" "git"
 
 
 # --------------------------------------------------------------------
@@ -75,14 +75,14 @@ __git_alias () {
 
 # --------------------------------------------------------------------
 # SCM Breeze functions
-_alias $git_status_shortcuts_alias="git_status_shortcuts"
-_alias $git_add_shortcuts_alias="git_add_shortcuts"
-_alias $exec_scmb_expand_args_alias="exec_scmb_expand_args"
-_alias $git_show_files_alias="git_show_affected_files"
-_alias $git_commit_all_alias='git_commit_all'
+_alias "$git_status_shortcuts_alias"  "git_status_shortcuts"
+_alias "$git_add_shortcuts_alias"     "git_add_shortcuts"
+_alias "$exec_scmb_expand_args_alias" "exec_scmb_expand_args"
+_alias "$git_show_files_alias"        "git_show_affected_files"
+_alias "$git_commit_all_alias"        "git_commit_all"
 
 # Git Index alias
-_alias $git_index_alias="git_index"
+_alias "$git_index_alias"             "git_index"
 
 # Only set up the following aliases if 'git_setup_aliases' is 'yes'
 if [ "$git_setup_aliases" = "yes" ]; then
@@ -139,16 +139,17 @@ if [ "$git_setup_aliases" = "yes" ]; then
 
 
   # Compound/complex commands
-  _alias $git_fetch_all_alias="git fetch --all"
-  _alias $git_pull_then_push_alias="git pull && git push"
-  _alias $git_fetch_and_rebase_alias='git fetch && git rebase'
-  _alias $git_commit_amend_alias='git commit --amend'
+  _alias "$git_fetch_all_alias"           "git fetch --all"
+  _alias "$git_pull_then_push_alias"      "git pull && git push"
+  _alias "$git_fetch_and_rebase_alias"    "git fetch && git rebase"
+  _alias "$git_commit_amend_alias"        "git commit --amend"
+
   # Add staged changes to latest commit without prompting for message
-  _alias $git_commit_amend_no_msg_alias='git commit --amend -C HEAD'
-  _alias $git_commit_no_msg_alias='git commit -C HEAD'
-  _alias $git_log_stat_alias='git log --stat --max-count=5'
-  _alias $git_log_graph_alias='git log --graph --max-count=5'
-  _alias $git_add_all_alias='git add --all .'
+  _alias "$git_commit_amend_no_msg_alias" "git commit --amend -C HEAD"
+  _alias "$git_commit_no_msg_alias"       "git commit -C HEAD"
+  _alias "$git_log_stat_alias"            "git log --stat --max-count=5"
+  _alias "$git_log_graph_alias"           "git log --graph --max-count=5"
+  _alias "$git_add_all_alias"             "git add --all ."
 fi
 
 
@@ -168,4 +169,3 @@ if [ $shell = "bash" ]; then
 else
   compdef _git_index_tab_completion git_index $git_index_alias
 fi
-
diff --git a/lib/scm_breeze.sh b/lib/scm_breeze.sh
index 59e4548..2c692bb 100644
--- a/lib/scm_breeze.sh
+++ b/lib/scm_breeze.sh
@@ -10,7 +10,13 @@ enable_nullglob()  { if [ $shell = "zsh" ]; then setopt NULL_GLOB;   else shopt
 disable_nullglob() { if [ $shell = "zsh" ]; then unsetopt NULL_GLOB; else shopt -u nullglob; fi; }
 
 # Alias wrapper that ignores errors if alias is not defined.
-_alias(){ alias "$@" 2> /dev/null; }
+_safe_alias(){ alias "$@" 2> /dev/null; }
+_alias() {
+  if [ -n "$1" ]; then
+    local alias_str="$1"; local cmd="$2"
+    _safe_alias $alias_str="$cmd"
+  fi
+}
 
 find_binary(){
   if [ $shell = "zsh" ]; then