diff --git a/.bashrc b/.bashrc
index 02635f3..99c56b8 100644
--- a/.bashrc
+++ b/.bashrc
@@ -159,9 +159,15 @@ fi
 #  export PATH=$PATH:$GOROOT/bin
 #fi
 
-export GOPATH=$HOME/go
-export EDITOR=/usr/bin/vim
+if [ -d "$HOME/go" ] ; then
+ export GOPATH=$HOME/go
+fi
+
+#if [ -f /usr/bin/vim" ] ; then
+export EDITOR=/usr/bin/vim 
 export VISUAL=$EDITOR
+#fi
+
 export LC_TIME="sk_SK.UTF8"
 export LC_ALL="sk_SK.UTF8"