diff --git a/Gopkg.lock b/Gopkg.lock
index a1372b1fa8..8a786fc3d3 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -2,7 +2,6 @@
 
 
 [[projects]]
-  branch = "master"
   digest = "1:09a7f74eb6bb3c0f14d8926610c87f569c5cff68e978d30e9a3540aeb626fdf0"
   name = "github.com/bartekn/go-bip39"
   packages = ["."]
diff --git a/Gopkg.toml b/Gopkg.toml
index da2c8e29ce..012698c615 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -10,11 +10,6 @@
 #   name = "github.com/user/project"
 #   version = "1.0.0"
 #
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
 # [[override]]
 #   name = "github.com/x/y"
 #   version = "2.4.0"
@@ -66,7 +61,7 @@
 
 [[constraint]]
   name = "github.com/bartekn/go-bip39"
-  branch = "master"
+  revision = "a05967ea095d81c8fe4833776774cfaff8e5036c"
 
 [[constraint]]
   name = "github.com/zondax/ledger-goclient"
diff --git a/Makefile b/Makefile
index 6f440e0200..b6b136f517 100644
--- a/Makefile
+++ b/Makefile
@@ -119,6 +119,8 @@ test_lint:
 	gometalinter.v2 --config=tools/gometalinter.json ./...
 	!(gometalinter.v2 --disable-all --enable='errcheck' --vendor ./... | grep -v "client/")
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s
+	dep status >> /dev/null
+	!(grep -n branch Gopkg.toml)
 
 format:
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -w -s
diff --git a/crypto/ledger_secp256k1.go b/crypto/ledger_secp256k1.go
index 7a9f10c0dd..9e8940d7bf 100644
--- a/crypto/ledger_secp256k1.go
+++ b/crypto/ledger_secp256k1.go
@@ -153,6 +153,9 @@ func (pkl PrivKeyLedgerSecp256k1) pubkeyLedgerSecp256k1() (pub tmcrypto.PubKey,
 
 	// re-serialize in the 33-byte compressed format
 	cmp, err := secp256k1.ParsePubKey(key[:], secp256k1.S256())
+	if err != nil {
+		return nil, fmt.Errorf("error parsing public key: %v", err)
+	}
 	copy(pk[:], cmp.SerializeCompressed())
 
 	return pk, nil
diff --git a/x/gov/client/cli/tx.go b/x/gov/client/cli/tx.go
index 8369c99273..88c4b7d170 100644
--- a/x/gov/client/cli/tx.go
+++ b/x/gov/client/cli/tx.go
@@ -158,7 +158,7 @@ func GetCmdVote(cdc *wire.Codec) *cobra.Command {
 				return err
 			}
 
-			fmt.Printf("Vote[Voter:%s,ProposalID:%d,Option:%s]", bechVoter, msg.ProposalID, msg.Option)
+			fmt.Printf("Vote[Voter:%s,ProposalID:%d,Option:%s]", bechVoter, msg.ProposalID, msg.Option.String())
 
 			// build and sign the transaction, then broadcast to Tendermint
 			ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc))