diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc
index 45d45bd..d73b0c0 100644
--- a/assets/default/dotfiles/bashrc
+++ b/assets/default/dotfiles/bashrc
@@ -16,26 +16,41 @@ fi
 # Common paths for me
 export PATH=$PATH:$ANT_HOME/bin
 # Opt directory
-export PATH=/opt/local/bin:/opt/local/sbin:$PATH
-# Android SDK
+if [ -d /opt/local ]; then
+    export PATH=/opt/local/bin:/opt/local/sbin:$PATH
+fi
+
+export GOROOT=/usr/local/go
+if [ -d "$GOROOT" ]; then
+    export PATH=$PATH:$GOROOT/bin
+fi
+
 if [[ "$DET_OS" == "linux" ]]; then
     ANDROID_SDK=$HOME/workspace/adt-bundle-linux/sdk
-    export GOROOT=/usr/local/go
-    export PATH=$PATH:$GOROOT/bin
 elif [[ "$DET_OS" == "mac" ]]; then
     ANDROID_SDK=$HOME/workspace/android-sdk-macosx
-    export PATH=$HOME/Library/Python/2.7/bin:$PATH
+
+    go_workspace=$HOME/workspace/go_workspace
+    if [ -d "$go_workspace" ]; then
+        export GOPATH=$go_workspace
+        export PATH=$PATH:$GOPATH/bin
+    fi
 
     # Fix Python path on OSX to avoid considering System extras over newer versions
-    export PYTHONPATH=/Library/Python/2.7/site-packages:$PYTHONPATH
+    # export PATH=$HOME/Library/Python/2.7/bin:$PATH
+    # export PYTHONPATH=/Library/Python/2.7/site-packages:$PYTHONPATH
+    export PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages:/Library/Python/2.7/site-packages:$PYTHONPATH
 fi
+
+# Android paths
 export ANDROID_HOME=$ANDROID_SDK
 export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools
-# Add RVM to PATH for scripting
-export PATH=$PATH:$HOME/.rvm/bin
-# Add ~/bin
+
+# Home path
 export PATH=$HOME/bin:$PATH
 
+# Add RVM to PATH for scripting
+export PATH=$PATH:$HOME/.rvm/bin
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
 
 # Increase memory sizes for java using Ant
diff --git a/assets/default/fish-config/paths.fish b/assets/default/fish-config/paths.fish
index 06ca11e..1c99844 100644
--- a/assets/default/fish-config/paths.fish
+++ b/assets/default/fish-config/paths.fish
@@ -10,24 +10,28 @@ switch (uname)
 end
 
 # opt directory
-set -gx PATH /opt/local/bin /opt/local/sbin $PATH
+if [ -d /opt/local ]
+    set -gx PATH /opt/local/bin /opt/local/sbin $PATH
+end
+
+# Google GO
+set -gx GOROOT /usr/local/go
+if [ -d "$GOROOT" ]
+    set -gx PATH $PATH $GOROOT/bin
+end
 
 if [ $det_os = "linux" ]
     set android_sdk $HOME/workspace/adt-bundle-linux/sdk
-
-    set -gx GOROOT /usr/local/go
-    set -gx PATH $PATH $GOROOT/bin
 else if [ $det_os = "mac" ]
     set android_sdk $HOME/workspace/android-sdk-macosx
+
+    set go_workspace $HOME/workspace/go_workspace
+    if [ -d "$go_workspace" ]
+        set -gx GOPATH $go_workspace
+        set -gx PATH $PATH $GOPATH/bin
+    end
+
     # set PATH $HOME/Library/Python/2.7/bin $PATH
-
-    set -gx GOROOT /usr/local/go
-    set -gx PATH $PATH $GOROOT/bin
-
-    set go_workspace $HOME/workspace/go
-    set -gx PATH $PATH $go_workspace/bin
-    set -gx GOPATH $go_workspace $GOROOT
-
     # Fix Python path on OSX to avoid considering System extras over newer versions
     set -gx PYTHONPATH /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages /Library/Python/2.7/site-packages $PYTHONPATH
 end
@@ -38,9 +42,11 @@ end
 # set -gx PATH $bin_path $PATH
 # set -gx PYTHONPATH "$sdk_dir/platform/google_appengine" $PYTHONPATH
 
+# Android paths
 set -gx ANDROID_HOME $android_sdk
 set -gx PATH $PATH $android_sdk/platform-tools $android_sdk/tools
 
+# Home path
 set -gx  PATH $HOME/bin $PATH
 
 #[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*