diff --git a/common/configure_fresh_system.sh b/common/configure_fresh_system.sh
index 64928839..81e481f4 100755
--- a/common/configure_fresh_system.sh
+++ b/common/configure_fresh_system.sh
@@ -162,8 +162,10 @@ if [[ -z $NOVIM ]]; then
         git pull
         git submodule update --init --recursive
     fi
-    echo "Installing fzf"
-    ~/.fzf/install --64 --all
+    if [[ -z $NO_GO ]]; then
+        echo "Installing fzf"
+        ~/.fzf/install --64 --all
+    fi
     echo "Installing Vim plugins"
     echo "\n" | vim +PluginInstall! +qa
 
diff --git a/windows/build.bat b/windows/build.bat
index 52a43dc5..63db3440 100644
--- a/windows/build.bat
+++ b/windows/build.bat
@@ -4,7 +4,7 @@ choco upgrade -y all
 call refreshenv
 
 wget -c https://cygwin.com/setup-x86_64.exe
-setup-x86_64.exe -R "C:\cygwin64" -s http://mirror.switch.ch/ftp/mirror/cygwin/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,clang,gcc,gcc-g++,lua,perl,the_silver_searcher,gnupg,patch,zlib-devel,openssl-devel,libyaml-devel,libyaml0_2,sqlite3,make,libtool,autoconf,automake,bison,m4,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core,patch,cygwin32-readline,libcrypt-devel,libcrypt0,ncurses,libncurses-devel,python-devel,libxslt,libxslt-devel,libjpeg-devel
+setup-x86_64.exe -R "C:\cygwin64" -s http://mirror.switch.ch/ftp/mirror/cygwin/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,clang,gcc,gcc-g++,lua,perl,the_silver_searcher,gnupg,patch,zlib-devel,openssl-devel,libyaml-devel,libyaml0_2,sqlite3,make,libtool,autoconf,automake,bison,m4,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core,patch,cygwin32-readline,libcrypt-devel,libcrypt0,ncurses,libncurses-devel,python-devel,libxslt,libxslt-devel,libjpeg-devel,python
 
 set script_path=%~dp0
 set repo_path=%script_path%\..\
@@ -16,8 +16,11 @@ set bash=c:\cygwin64\bin\bash.exe --login -c
 
 for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev-parse --abbrev-ref HEAD"') do set "branch=%%A" 
 %bash% 'echo "branch is $branch"'
+if %errorlevel% neq 0 exit /b %errorlevel%
 %bash% "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/"
+if %errorlevel% neq 0 exit /b %errorlevel%
 %bash% "export OUTER_CLONE=`cygpath $repo_path` && $script_path/build_insider.sh"
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo Configuring Windows-specific settings
 echo %repo_path% is repo path