diff --git a/DOCKER/run.sh b/DOCKER/run.sh
index 72430626..93151a8b 100755
--- a/DOCKER/run.sh
+++ b/DOCKER/run.sh
@@ -1,8 +1,9 @@
 #! /bin/bash
 
-go get -u $TMREPO/cmd/tendermint
-cd $GOPATH/src/$TMREPO
-git fetch -a origin
+mkdir -p $GOPATH/src/$TMREPO
+git clone https://$TMREPO.git .
+git fetch
 git reset --hard $TMHEAD
+go get $TMREPO/cmd/tendermint
 make
 tendermint node
diff --git a/cmd/tendermint/main.go b/cmd/tendermint/main.go
index f84187c6..647a7d8e 100644
--- a/cmd/tendermint/main.go
+++ b/cmd/tendermint/main.go
@@ -53,6 +53,6 @@ Commands:
 	case "version":
 		fmt.Println(node.Version)
 	default:
-		fmt.Printf("Unknown command %v\n", args[0])
+		Exit(Fmt("Unknown command %v\n", args[0]))
 	}
 }