minor fixes

Author: e-asphyx

encoding/decode.go

@@ -226,7 +226,7 @@ func decodeValue(data []byte, out reflect.Value, ctx *Context, fl []flag, path E
 		var dec Decoder
 		if out.Type().Implements(decoderType) {
 			dec = out.Interface().(Decoder)
-		} else if reflect.PtrTo(out.Type()).Implements(decoderType) && out.CanAddr() {
+		} else if reflect.PointerTo(out.Type()).Implements(decoderType) && out.CanAddr() {
 			dec = out.Addr().Interface().(Decoder)
 		}
 		if dec != nil {
@@ -249,6 +249,7 @@ func decodeValue(data []byte, out reflect.Value, ctx *Context, fl []flag, path E
 			Path: append(path, err.Path...),
 			Err:  err.Err,
 		}
+		return nil, err
 	}
 	if val.IsValid() {
 		out.Set(val)

encoding/encode.go

@@ -175,7 +175,7 @@ func encodeValue(out io.Writer, val reflect.Value, ctx *Context, fl []flag, path
 	// concrete type
 	if val.Kind() != reflect.Interface {
 		// user type
-		if wantsVal := val.Type().Implements(encoderType); wantsVal || reflect.PtrTo(val.Type()).Implements(encoderType) && val.CanAddr() {
+		if wantsVal := val.Type().Implements(encoderType); wantsVal || reflect.PointerTo(val.Type()).Implements(encoderType) && val.CanAddr() {
 			var enc Encoder
 			if wantsVal {
 				enc = val.Interface().(Encoder)