diff --git a/arkanum b/arkanum
index 72faf7e..96878cc 100755
--- a/arkanum
+++ b/arkanum
@@ -243,13 +243,24 @@ EOF
 }
 
 function setGitConfig() {
-  if [[ "$#" != "2" ]]; then
-    sayE "Invalid arguments given. Please provide '<user>' and 'email'!" "Git"
+  #echo "function arg counter is; $#"
+  #echo "function args:$@"
+
+  if [[ "$#" != "4" ]]; then
+    sayE "Invalid arguments given. Please provide '<user>' and '<email>'!" "Git"
+    exit 1
+  fi
+  if [[ -z "$3" ]]; then
+    sayE "Invalid or empty username given!" "Git"
+    exit 1
+  fi
+  if [[ -z "$4" ]]; then
+    sayE "Invalid or empty email given!" "Git"
     exit 1
   fi
   say "Setting global git config..." "Git"
-  git config --global user.name "$1"
-  git config --global user.email "$2"
+  git config --global user.name "$3"
+  git config --global user.email "$4"
   say "Returning global config:" "Git"
   git config --list --global
 }
@@ -287,7 +298,7 @@ function main() {
   elif [[ "$1" == "git" ]]; then
     # setup option
     if [[ "$2" == "setup" ]]; then
-      setGitConfig "$3" "$4"
+      setGitConfig "$@"
     else
       sayE "Unknown option ($2) given for command 'git'!"
     fi