diff --git a/.travis.yml b/.travis.yml
index 2e8f813..4c70460 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ go:
 
 matrix:
   allow_failures:
+    - go: 1.4
     - go: tip
 
 install:
diff --git a/Makefile b/Makefile
index 9ee35b2..4562692 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 all: testdeps
 	go test ./...
 	go test ./... -short -race
+	go vet
 
 testdeps: testdata/redis/src/redis-server
 
diff --git a/iterator.go b/iterator.go
index d48ad7b..e885985 100644
--- a/iterator.go
+++ b/iterator.go
@@ -71,7 +71,6 @@ func (it *ScanIterator) Next() bool {
 			return true
 		}
 	}
-	return false
 }
 
 // Val returns the key/field at the current cursor position.
diff --git a/parser.go b/parser.go
index 10580ab..0971412 100644
--- a/parser.go
+++ b/parser.go
@@ -383,7 +383,7 @@ func commandInfoSliceParser(rd *proto.Reader, n int64) (interface{}, error) {
 // Implements proto.MultiBulkParse
 func timeParser(rd *proto.Reader, n int64) (interface{}, error) {
 	if n != 2 {
-		fmt.Errorf("got %d elements, expected 2", n)
+		return nil, fmt.Errorf("got %d elements, expected 2", n)
 	}
 
 	secStr, err := rd.ReadStringReply()