diff --git a/bash_profile b/bash_profile
index 858a5b7..dd89c14 100644
--- a/bash_profile
+++ b/bash_profile
@@ -68,7 +68,7 @@ _bash_profile_main() {
     _source_bash_extras
 
     get_ssh_agent
-    get_gpg_agent
+    which gpg-agent && test -d ~/.gnupg && get_gpg_agent
 
     _source_if_exists "$HOME/.gvm/scripts/gvm"
     _source_if_exists "$HOME/.gvmrc"
diff --git a/gitconfig b/gitconfig
index 4ee978b..dccc496 100644
--- a/gitconfig
+++ b/gitconfig
@@ -12,7 +12,7 @@
     receivepack = true
 
 [push]
-	default = simple
+	default = matching
 
 [color]
     ui = auto