diff --git a/stdlib/sql.go b/stdlib/sql.go
index 048e6d04..94899c20 100644
--- a/stdlib/sql.go
+++ b/stdlib/sql.go
@@ -73,6 +73,7 @@ func init() {
 	databaseSqlOids[pgx.Float8Oid] = true
 	databaseSqlOids[pgx.DateOid] = true
 	databaseSqlOids[pgx.TimestampTzOid] = true
+	databaseSqlOids[pgx.TimestampOid] = true
 }
 
 type Driver struct {
diff --git a/values.go b/values.go
index 1f0647b5..2d5738b5 100644
--- a/values.go
+++ b/values.go
@@ -1089,6 +1089,7 @@ func decodeTimestamp(vr *ValueReader) time.Time {
 
 	if vr.Len() != 8 {
 		vr.Fatal(ProtocolError(fmt.Sprintf("Received an invalid size for an timestamp: %d", vr.Len())))
+		return zeroTime
 	}
 
 	microsecSinceY2K := vr.ReadInt64()