diff --git a/Makefile b/Makefile
index 59b294109..fe0ce735f 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,6 @@ metalinter_test: ensure_tools
 		--enable=deadcode \
 		--enable=gas \
 		--enable=gosimple \
-		--enable=gotype \
 	 	--enable=ineffassign \
 	 	--enable=misspell \
 		--enable=safesql \
@@ -105,6 +104,7 @@ metalinter_test: ensure_tools
 		#--enable=gocyclo \
 		#--enable=goimports \
 		#--enable=golint \ <== comments on anything exported
+		#--enable=gotype \
 	   	#--enable=interfacer \
 	   	#--enable=megacheck \
 	   	#--enable=staticcheck \
diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go
index c48e72f79..9ac163eb9 100644
--- a/consensus/byzantine_test.go
+++ b/consensus/byzantine_test.go
@@ -70,7 +70,7 @@ func TestByzantine(t *testing.T) {
 		conR.SetLogger(logger.With("validator", i))
 		conR.SetEventBus(eventBus)
 
-		var conRI p2p.Reactor // nolint: gotype
+		var conRI p2p.Reactor // nolint: gotype, gosimple
 		conRI = conR
 
 		if i == 0 {
@@ -293,12 +293,12 @@ func (privVal *ByzantinePrivValidator) SignVote(chainID string, vote *types.Vote
 }
 
 func (privVal *ByzantinePrivValidator) SignProposal(chainID string, proposal *types.Proposal) (err error) {
-	proposal.Signature, err = privVal.Sign(types.SignBytes(chainID, proposal))
+	proposal.Signature, _ = privVal.Sign(types.SignBytes(chainID, proposal))
 	return nil
 }
 
 func (privVal *ByzantinePrivValidator) SignHeartbeat(chainID string, heartbeat *types.Heartbeat) (err error) {
-	heartbeat.Signature, err = privVal.Sign(types.SignBytes(chainID, heartbeat))
+	heartbeat.Signature, _ = privVal.Sign(types.SignBytes(chainID, heartbeat))
 	return nil
 }
 
diff --git a/consensus/replay.go b/consensus/replay.go
index 427d04293..29772a2b7 100644
--- a/consensus/replay.go
+++ b/consensus/replay.go
@@ -99,6 +99,9 @@ func (cs *ConsensusState) catchupReplay(csHeight int) error {
 	// NOTE: This is just a sanity check. As far as we know things work fine without it,
 	// and Handshake could reuse ConsensusState if it weren't for this check (since we can crash after writing ENDHEIGHT).
 	gr, found, err := cs.wal.SearchForEndHeight(uint64(csHeight))
+	if err != nil {
+		return err
+	}
 	if gr != nil {
 		if err := gr.Close(); err != nil {
 			return err
diff --git a/consensus/state.go b/consensus/state.go
index 0c5ad3a65..a535a1017 100644
--- a/consensus/state.go
+++ b/consensus/state.go
@@ -372,7 +372,7 @@ func (cs *ConsensusState) updateRoundStep(round int, step cstypes.RoundStepType)
 // enterNewRound(height, 0) at cs.StartTime.
 func (cs *ConsensusState) scheduleRound0(rs *cstypes.RoundState) {
 	//cs.Logger.Info("scheduleRound0", "now", time.Now(), "startTime", cs.StartTime)
-	sleepDuration := rs.StartTime.Sub(time.Now()) // nolint: gotype
+	sleepDuration := rs.StartTime.Sub(time.Now()) // nolint: gotype, gosimple
 	cs.scheduleTimeout(sleepDuration, rs.Height, 0, cstypes.RoundStepNewHeight)
 }
 
diff --git a/node/node.go b/node/node.go
index c25c01027..2de87b1ea 100644
--- a/node/node.go
+++ b/node/node.go
@@ -384,7 +384,7 @@ func (n *Node) OnStop() {
 	n.eventBus.Stop()
 }
 
-// RunForever waits for an interupt signal and stops the node.
+// RunForever waits for an interrupt signal and stops the node.
 func (n *Node) RunForever() {
 	// Sleep forever and then...
 	cmn.TrapSignal(func() {
diff --git a/p2p/upnp/upnp.go b/p2p/upnp/upnp.go
index 2d0ad53e7..cac67a730 100644
--- a/p2p/upnp/upnp.go
+++ b/p2p/upnp/upnp.go
@@ -63,6 +63,9 @@ func Discover() (nat NAT, err error) {
 		}
 		var n int
 		_, _, err = socket.ReadFromUDP(answerBytes)
+		if err != nil {
+			return
+		}
 		for {
 			n, _, err = socket.ReadFromUDP(answerBytes)
 			if err != nil {
diff --git a/p2p/util.go b/p2p/util.go
index 25385d0a2..0066e348d 100644
--- a/p2p/util.go
+++ b/p2p/util.go
@@ -7,7 +7,7 @@ import (
 // doubleSha256 calculates sha256(sha256(b)) and returns the resulting bytes.
 func doubleSha256(b []byte) []byte {
 	hasher := sha256.New()
-	_, _ := hasher.Write(b) // error ignored
+	_, _ = hasher.Write(b) // error ignored
 	sum := hasher.Sum(nil)
 	hasher.Reset()
 	_, _ = hasher.Write(sum) // error ignored
diff --git a/rpc/lib/server/handlers.go b/rpc/lib/server/handlers.go
index aaa1549d0..d46f0ed20 100644
--- a/rpc/lib/server/handlers.go
+++ b/rpc/lib/server/handlers.go
@@ -782,5 +782,5 @@ func writeListOfEndpoints(w http.ResponseWriter, r *http.Request, funcMap map[st
 	buf.WriteString("</body></html>")
 	w.Header().Set("Content-Type", "text/html")
 	w.WriteHeader(200)
-	_, _ := w.Write(buf.Bytes()) // error ignored
+	_, _ = w.Write(buf.Bytes()) // error ignored
 }