stdlib: Improve error handling

2 files changed, 111 insertions, 70 deletions

diff --git a/lib/stdlib/src/uri_string.erl b/lib/stdlib/src/uri_string.erl
index 1b8f8b828f..51f7564934 100644
--- a/lib/stdlib/src/uri_string.erl
+++ b/lib/stdlib/src/uri_string.erl
@@ -293,11 +293,22 @@
       URIString :: uri_string(),
       URIMap :: uri_map().
 parse(URIString) when is_binary(URIString) ->
-    parse_uri_reference(URIString, #{});
+    try parse_uri_reference(URIString, #{}) of
+        Result -> Result
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end;
 parse(URIString) when is_list(URIString) ->
-    Binary = unicode:characters_to_binary(URIString),
-    Map = parse_uri_reference(Binary, #{}),
-    convert_mapfields_to_list(Map).
+    try
+        Binary = unicode:characters_to_binary(URIString),
+        Map = parse_uri_reference(Binary, #{}),
+        convert_mapfields_to_list(Map)
+    of
+        Result -> Result
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+
 
 %%-------------------------------------------------------------------------
 %% Recompose URIs
@@ -308,17 +319,24 @@ parse(URIString) when is_list(URIString) ->
 recompose(Map) ->
     case is_valid_map(Map) of
         false ->
-            error({badarg, invalid_map});
+            {error, invalid_map, Map};
         true ->
-            T0 = update_scheme(Map, empty),
-            T1 = update_userinfo(Map, T0),
-            T2 = update_host(Map, T1),
-            T3 = update_port(Map, T2),
-            T4 = update_path(Map, T3),
-            T5 = update_query(Map, T4),
-            update_fragment(Map, T5)
+            try
+                T0 = update_scheme(Map, empty),
+                T1 = update_userinfo(Map, T0),
+                T2 = update_host(Map, T1),
+                T3 = update_port(Map, T2),
+                T4 = update_path(Map, T3),
+                T5 = update_query(Map, T4),
+                update_fragment(Map, T5)
+            of
+                Result -> Result
+            catch
+                throw:{error, Atom, RestData} -> {error, Atom, RestData}
+            end
     end.
 
+
 %%-------------------------------------------------------------------------
 %% Resolve references
 %%-------------------------------------------------------------------------
@@ -364,7 +382,7 @@ transcode(URIString, Options) when is_binary(URIString) ->
     of
         Result -> Result
     catch
-        throw:{error, L, RestData} -> {invalid_input, L, RestData}
+        throw:{error, _, RestData} -> {error, invalid_input, RestData}
     end;
 transcode(URIString, Options) when is_list(URIString) ->
     InEnc = proplists:get_value(in_encoding, Options, utf8),
@@ -373,7 +391,7 @@ transcode(URIString, Options) when is_list(URIString) ->
     try transcode(Flattened, [], InEnc, OutEnc) of
         Result -> Result
     catch
-        throw:{error, List, RestData} -> {invalid_input, List, RestData}
+        throw:{error, _, RestData} -> {error, invalid_input, RestData}
     end.
 
 
@@ -467,7 +485,7 @@ parse_uri_reference(URIString, URI) ->
     try parse_scheme_start(URIString, URI) of
         Res -> Res
     catch
-        throw:uri_parse_error ->
+        throw:{_,_,_} ->
             parse_relative_part(URIString, URI)
     end.
 
@@ -495,7 +513,7 @@ parse_relative_part(?STRING_REST("//", Rest), URI) ->
             URI2 = maybe_add_path(URI1),
             URI2#{userinfo => decode_userinfo(Userinfo)}
     catch
-        throw:uri_parse_error ->
+        throw:{_,_,_} ->
             {T, URI1} = parse_host(Rest, URI),
             Host = calculate_parsed_part_sl(Rest, T),
             URI2 = maybe_add_path(URI1),
@@ -521,7 +539,7 @@ parse_relative_part(?STRING_REST(Char, Rest), URI) ->
             {T, URI1} = parse_segment_nz_nc(Rest, URI),  % path-noscheme
             Path = calculate_parsed_part(Rest, T),
             URI1#{path => decode_path(?STRING_REST(Char, Path))};
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end.
 
 
@@ -571,7 +589,7 @@ parse_segment(?STRING_REST($#, Rest), URI) ->
 parse_segment(?STRING_REST(Char, Rest), URI) ->
     case is_pchar(Char) of
         true -> parse_segment(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_segment(?STRING_EMPTY, URI) ->
     {?STRING_EMPTY, URI}.
@@ -594,7 +612,7 @@ parse_segment_nz_nc(?STRING_REST($#, Rest), URI) ->
 parse_segment_nz_nc(?STRING_REST(Char, Rest), URI) ->
     case is_segment_nz_nc(Char) of
         true -> parse_segment_nz_nc(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_segment_nz_nc(?STRING_EMPTY, URI) ->
     {?STRING_EMPTY, URI}.
@@ -629,7 +647,7 @@ parse_scheme_start(?STRING_REST(Char, Rest), URI) ->
                  Scheme = calculate_parsed_scheme(Rest, T),
                  URI2 = maybe_add_path(URI1),
 		 URI2#{scheme => ?STRING_REST(Char, Scheme)};
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end.
 
 %% Add path component if it missing after parsing the URI.
@@ -653,10 +671,10 @@ parse_scheme(?STRING_REST($:, Rest), URI) ->
 parse_scheme(?STRING_REST(Char, Rest), URI) ->
     case is_scheme(Char) of
         true  -> parse_scheme(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_scheme(?STRING_EMPTY, _URI) ->
-    throw(uri_parse_error).
+    throw({error,invalid_uri,<<>>}).
 
 
 %% Check if char is allowed in scheme
@@ -681,7 +699,7 @@ parse_hier(?STRING_REST("//", Rest), URI) ->
             Userinfo = calculate_parsed_userinfo(Rest, T),
 	    {Rest, URI1#{userinfo => decode_userinfo(Userinfo)}}
     catch
-        throw:uri_parse_error ->
+        throw:{_,_,_} ->
             {T, URI1} = parse_host(Rest, URI),
             Host = calculate_parsed_part_sl(Rest, T),
 	    {Rest, URI1#{host => decode_host(remove_brackets(Host))}}
@@ -704,7 +722,7 @@ parse_hier(?STRING_REST(Char, Rest), URI) ->  % path-rootless
             {T, URI1} = parse_segment(Rest, URI),
             Path = calculate_parsed_part(Rest, T),
             {Rest, URI1#{path => decode_path(?STRING_REST(Char, Path))}};
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_hier(?STRING_EMPTY, URI) ->
     {<<>>, URI}.
@@ -744,11 +762,11 @@ parse_userinfo(?STRING_REST($@, Rest), URI) ->
 parse_userinfo(?STRING_REST(Char, Rest), URI) ->
     case is_userinfo(Char) of
         true -> parse_userinfo(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_userinfo(?STRING_EMPTY, _URI) ->
     %% URI cannot end in userinfo state
-    throw(uri_parse_error).
+    throw({error,invalid_uri,<<>>}).
 
 
 %% Check if char is allowed in userinfo
@@ -847,7 +865,7 @@ parse_reg_name(?STRING_REST($#, Rest), URI) ->
 parse_reg_name(?STRING_REST(Char, Rest), URI) ->
     case is_reg_name(Char) of
         true -> parse_reg_name(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_reg_name(?STRING_EMPTY, URI) ->
     {?STRING_EMPTY, URI}.
@@ -883,7 +901,7 @@ parse_ipv4_bin(?STRING_REST($#, Rest), Acc, URI) ->
 parse_ipv4_bin(?STRING_REST(Char, Rest), Acc, URI) ->
     case is_ipv4(Char) of
         true -> parse_ipv4_bin(Rest, [Char|Acc], URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_ipv4_bin(?STRING_EMPTY, Acc, URI) ->
     _ = validate_ipv4_address(lists:reverse(Acc)),
@@ -899,7 +917,7 @@ is_ipv4(Char) -> is_digit(Char).
 validate_ipv4_address(Addr) ->
     case inet:parse_ipv4strict_address(Addr) of
         {ok, _} -> Addr;
-        {error, _} -> throw(uri_parse_error)
+        {error, _} -> throw({error,invalid_uri,Addr})
     end.
 
 
@@ -910,10 +928,10 @@ parse_ipv6_bin(?STRING_REST($], Rest), Acc, URI) ->
 parse_ipv6_bin(?STRING_REST(Char, Rest), Acc, URI) ->
     case is_ipv6(Char) of
         true -> parse_ipv6_bin(Rest, [Char|Acc], URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_ipv6_bin(?STRING_EMPTY, _Acc, _URI) ->
-    throw(uri_parse_error).
+    throw({error,invalid_uri,<<>>}).
 
 %% Check if char is allowed in IPv6 addresses
 -spec is_ipv6(char()) -> boolean().
@@ -943,7 +961,7 @@ parse_ipv6_bin_end(?STRING_REST($#, Rest), URI) ->
 parse_ipv6_bin_end(?STRING_REST(Char, Rest), URI) ->
     case is_ipv6(Char) of
         true -> parse_ipv6_bin_end(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_ipv6_bin_end(?STRING_EMPTY, URI) ->
     {?STRING_EMPTY, URI}.
@@ -952,7 +970,7 @@ parse_ipv6_bin_end(?STRING_EMPTY, URI) ->
 validate_ipv6_address(Addr) ->
     case inet:parse_ipv6strict_address(Addr) of
         {ok, _} -> Addr;
-        {error, _} -> throw(uri_parse_error)
+        {error, _} -> throw({error,invalid_uri,Addr})
     end.
 
 
@@ -981,7 +999,7 @@ parse_port(?STRING_REST($#, Rest), URI) ->
 parse_port(?STRING_REST(Char, Rest), URI) ->
     case is_digit(Char) of
         true -> parse_port(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_port(?STRING_EMPTY, URI) ->
     {?STRING_EMPTY, URI}.
@@ -1007,7 +1025,7 @@ parse_query(?STRING_REST($#, Rest), URI) ->
 parse_query(?STRING_REST(Char, Rest), URI) ->
     case is_query(Char) of
         true -> parse_query(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_query(?STRING_EMPTY, URI) ->
     {?STRING_EMPTY, URI}.
@@ -1033,7 +1051,7 @@ is_query(Char) -> is_pchar(Char).
 parse_fragment(?STRING_REST(Char, Rest), URI) ->
     case is_fragment(Char) of
         true -> parse_fragment(Rest, URI);
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_uri,[Char]})
     end;
 parse_fragment(?STRING_EMPTY, URI) ->
     {?STRING_EMPTY, URI}.
@@ -1335,9 +1353,9 @@ decode_fragment(Cs) ->
 check_utf8(Cs) ->
     case unicode:characters_to_list(Cs) of
         {incomplete,_,_} ->
-            throw(uri_parse_error);
+            throw({error,non_utf8,Cs});
         {error,_,_} ->
-            throw(uri_parse_error);
+            throw({error,non_utf8,Cs});
         _ -> Cs
     end.
 
@@ -1348,13 +1366,13 @@ check_utf8(Cs) ->
 %% Only validates as scheme cannot have percent-encoded characters
 -spec encode_scheme(list()|binary()) -> list() | binary().
 encode_scheme([]) ->
-    throw(uri_parse_error);
+    throw({error,invalid_scheme,""});
 encode_scheme(<<>>) ->
-    throw(uri_parse_error);
+    throw({error,invalid_scheme,<<>>});
 encode_scheme(Scheme) ->
     case validate_scheme(Scheme) of
         true -> Scheme;
-        false -> throw(uri_parse_error)
+        false -> throw({error,invalid_scheme,Scheme})
     end.
 
 -spec encode_userinfo(list()|binary()) -> list() | binary().
@@ -1390,12 +1408,12 @@ decode(<<$%,C0,C1,Cs/binary>>, Fun, Acc) ->
         true ->
             B = ?HEX2DEC(C0)*16+?HEX2DEC(C1),
             decode(Cs, Fun, <<Acc/binary, B>>);
-        false -> throw(uri_parse_error)
+        false -> throw({error,percent_decode,<<$%,C0,C1>>})
     end;
 decode(<<C,Cs/binary>>, Fun, Acc) ->
     case Fun(C) of
         true -> decode(Cs, Fun, <<Acc/binary, C>>);
-        false -> throw(uri_parse_error)
+        false -> throw({error,percent_decode,<<C,Cs/binary>>})
     end;
 decode(<<>>, _Fun, Acc) ->
     Acc.
@@ -1424,8 +1442,8 @@ encode(Component, Fun) when is_binary(Component) ->
 encode(<<Char/utf8, Rest/binary>>, Fun, Acc) ->
     C = encode_codepoint_binary(Char, Fun),
     encode(Rest, Fun, <<Acc/binary,C/binary>>);
-encode(<<_Char, _Rest/binary>>, _Fun, _Acc) ->
-    throw(uri_parse_error);
+encode(<<Char, Rest/binary>>, _Fun, _Acc) ->
+    throw({error,percent_encode,<<Char,Rest/binary>>});
 encode(<<>>, _Fun, Acc) ->
     Acc.
 
@@ -1554,7 +1572,8 @@ is_valid_map(Map) ->
          not maps:is_key(host, Map) andalso
          maps:is_key(port, Map))) orelse
         not maps:is_key(path, Map) orelse
-        not is_host_and_path_valid(Map)
+        not is_host_and_path_valid(Map) orelse
+        invalid_field_present(Map)
     of
         true ->
             false;
@@ -1563,6 +1582,16 @@ is_valid_map(Map) ->
     end.
 
 
+invalid_field_present(Map) ->
+    Fun = fun(K, _, AccIn) -> AccIn orelse
+                                      ((K =/= scheme) andalso (K =/= userinfo)
+                                       andalso (K =/= host) andalso (K =/= port)
+                                       andalso (K =/= path) andalso (K =/= query)
+                                       andalso (K =/= fragment))
+          end,
+    maps:fold(Fun, false, Map).
+
+
 is_host_and_path_valid(Map) ->
     Host = maps:get(host, Map, undefined),
     Path = maps:get(path, Map, undefined),
@@ -1745,9 +1774,9 @@ transcode_pct([], Acc, B, InEncoding, OutEncoding) ->
 convert_binary(Binary, InEncoding, OutEncoding) ->
     case unicode:characters_to_binary(Binary, InEncoding, OutEncoding) of
         {error, _List, RestData} ->
-            throw({error, unicode, RestData});
+            throw({error, invalid_input, RestData});
         {incomplete, _List, RestData} ->
-            throw({error, unicode, RestData});
+            throw({error, invalid_input, RestData});
         Result ->
             Result
     end.
@@ -1757,9 +1786,9 @@ convert_binary(Binary, InEncoding, OutEncoding) ->
 convert_list(Binary, InEncoding) ->
     case unicode:characters_to_list(Binary, InEncoding) of
         {error, _List, RestData} ->
-            throw({error, unicode, RestData});
+            throw({error, invalid_input, RestData});
         {incomplete, _List, RestData} ->
-            throw({error, unicode, RestData});
+            throw({error, invalid_input, RestData});
         Result ->
             Result
     end.
diff --git a/lib/stdlib/test/uri_string_SUITE.erl b/lib/stdlib/test/uri_string_SUITE.erl
index beb534e023..b70cb842de 100644
--- a/lib/stdlib/test/uri_string_SUITE.erl
+++ b/lib/stdlib/test/uri_string_SUITE.erl
@@ -32,7 +32,7 @@
          parse_pct_encoded_userinfo/1, parse_port/1,
          parse_query/1, parse_scheme/1, parse_userinfo/1,
 	 parse_list/1, parse_binary/1, parse_mixed/1, parse_relative/1,
-         parse_special/1, parse_special2/1,
+         parse_special/1, parse_special2/1, parse_negative/1,
          recompose_fragment/1, recompose_parse_fragment/1,
          recompose_query/1, recompose_parse_query/1,
          recompose_path/1, recompose_parse_path/1,
@@ -95,6 +95,7 @@ all() ->
      parse_relative,
      parse_special,
      parse_special2,
+     parse_negative,
      recompose_fragment,
      recompose_parse_fragment,
      recompose_query,
@@ -343,8 +344,8 @@ parse_binary_pct_encoded_userinfo(_Config) ->
         uri_string:parse(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93">>),
     #{scheme := <<"foo">>, userinfo := <<"合:気"/utf8>>, host := <<"道"/utf8>>} =
         uri_string:parse(<<"foo://%E5%90%88:%E6%B0%97@%E9%81%93">>),
-    uri_parse_error =(catch uri_string:parse(<<"//%E5%90%88@%E6%B0%97%E9%81%93@">>)),
-    uri_parse_error = (catch uri_string:parse(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93@">>)).
+    {error,invalid_uri,"@"} = uri_string:parse(<<"//%E5%90%88@%E6%B0%97%E9%81%93@">>),
+    {error,invalid_uri,":"} = uri_string:parse(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93@">>).
 
 parse_binary_host(_Config) ->
     #{host := <<"hostname">>} = uri_string:parse(<<"//hostname">>),
@@ -359,8 +360,8 @@ parse_binary_host_ipv4(_Config) ->
     #{host := <<"127.0.0.1">>, query := <<"name=ferret">>} =
         uri_string:parse(<<"//127.0.0.1?name=ferret">>),
     #{host := <<"127.0.0.1">>, fragment := <<"nose">>} = uri_string:parse(<<"//127.0.0.1#nose">>),
-    uri_parse_error = (catch uri_string:parse(<<"//127.0.0.x">>)),
-    uri_parse_error = (catch uri_string:parse(<<"//1227.0.0.1">>)).
+    {error,invalid_uri,"x"} = uri_string:parse(<<"//127.0.0.x">>),
+    {error,invalid_uri,"1227.0.0.1"} = uri_string:parse(<<"//1227.0.0.1">>).
 
 parse_binary_host_ipv6(_Config) ->
     #{host := <<"::127.0.0.1">>} = uri_string:parse(<<"//[::127.0.0.1]">>),
@@ -372,9 +373,9 @@ parse_binary_host_ipv6(_Config) ->
         uri_string:parse(<<"//[::127.0.0.1]?name=ferret">>),
     #{host := <<"::127.0.0.1">>, fragment := <<"nose">>} =
         uri_string:parse(<<"//[::127.0.0.1]#nose">>),
-    uri_parse_error = (catch uri_string:parse(<<"//[::127.0.0.x]">>)),
-    uri_parse_error = (catch uri_string:parse(<<"//[::1227.0.0.1]">>)),
-    uri_parse_error = (catch uri_string:parse(<<"//[2001:0db8:0000:0000:0000:0000:1428:G7ab]">>)).
+    {error,invalid_uri,"x"} = uri_string:parse(<<"//[::127.0.0.x]">>),
+    {error,invalid_uri,"::1227.0.0.1"} = uri_string:parse(<<"//[::1227.0.0.1]">>),
+    {error,invalid_uri,"G"} = uri_string:parse(<<"//[2001:0db8:0000:0000:0000:0000:1428:G7ab]">>).
 
 parse_binary_port(_Config) ->
     #{path:= <<"/:8042">>} =
@@ -389,8 +390,8 @@ parse_binary_port(_Config) ->
         uri_string:parse(<<"foo://:8042">>),
     #{scheme := <<"foo">>, host := <<"example.com">>, port := 8042} =
         uri_string:parse(<<"foo://example.com:8042">>),
-    uri_parse_error = (catch uri_string:parse(":600")),
-    uri_parse_error = (catch uri_string:parse("//:8042x")).
+    {error,invalid_uri,":"} = uri_string:parse(":600"),
+    {error,invalid_uri,"x"} = uri_string:parse("//:8042x").
 
 parse_binary_path(_Config) ->
     #{path := <<"over/there">>} = uri_string:parse(<<"over/there">>),
@@ -511,8 +512,8 @@ parse_pct_encoded_userinfo(_Config) ->
         uri_string:parse("foo://%E5%90%88@%E6%B0%97%E9%81%93"),
     #{scheme := "foo", userinfo := "合:気", host := "道"} =
         uri_string:parse("foo://%E5%90%88:%E6%B0%97@%E9%81%93"),
-    uri_parse_error =(catch uri_string:parse("//%E5%90%88@%E6%B0%97%E9%81%93@")),
-    uri_parse_error = (catch uri_string:parse("foo://%E5%90%88@%E6%B0%97%E9%81%93@")).
+    {error,invalid_uri,"@"} = uri_string:parse("//%E5%90%88@%E6%B0%97%E9%81%93@"),
+    {error,invalid_uri,":"} = uri_string:parse("foo://%E5%90%88@%E6%B0%97%E9%81%93@").
 
 
 parse_host(_Config) ->
@@ -528,8 +529,8 @@ parse_host_ipv4(_Config) ->
     #{host := "127.0.0.1", path := "/over/there"} = uri_string:parse("//127.0.0.1/over/there"),
     #{host := "127.0.0.1", query := "name=ferret"} = uri_string:parse("//127.0.0.1?name=ferret"),
     #{host := "127.0.0.1", fragment := "nose"} = uri_string:parse("//127.0.0.1#nose"),
-    uri_parse_error = (catch uri_string:parse("//127.0.0.x")),
-    uri_parse_error = (catch uri_string:parse("//1227.0.0.1")).
+    {error,invalid_uri,"x"} = uri_string:parse("//127.0.0.x"),
+    {error,invalid_uri,"1227.0.0.1"} = uri_string:parse("//1227.0.0.1").
 
 parse_host_ipv6(_Config) ->
     #{host := "::127.0.0.1"} = uri_string:parse("//[::127.0.0.1]"),
@@ -537,9 +538,9 @@ parse_host_ipv6(_Config) ->
     #{host := "::127.0.0.1", query := "name=ferret"} =
         uri_string:parse("//[::127.0.0.1]?name=ferret"),
     #{host := "::127.0.0.1", fragment := "nose"} = uri_string:parse("//[::127.0.0.1]#nose"),
-    uri_parse_error = (catch uri_string:parse("//[::127.0.0.x]")),
-    uri_parse_error = (catch uri_string:parse("//[::1227.0.0.1]")),
-    uri_parse_error = (catch uri_string:parse("//[2001:0db8:0000:0000:0000:0000:1428:G7ab]")).
+    {error,invalid_uri,"x"} = uri_string:parse("//[::127.0.0.x]"),
+    {error,invalid_uri,"::1227.0.0.1"} = uri_string:parse("//[::1227.0.0.1]"),
+    {error,invalid_uri,"G"} = uri_string:parse("//[2001:0db8:0000:0000:0000:0000:1428:G7ab]").
 
 parse_port(_Config) ->
     #{path:= "/:8042"} =
@@ -693,6 +694,17 @@ parse_special2(_Config) ->
     #{host := [],path := "/",userinfo := []} = uri_string:parse("//@/"),
     #{host := [],path := "/",scheme := "foo",userinfo := []} = uri_string:parse("foo://@/").
 
+parse_negative(_Config) ->
+    {error,invalid_uri,"å"} = uri_string:parse("å"),
+    {error,invalid_uri,"å"} = uri_string:parse("aå:/foo"),
+    {error,invalid_uri,":"} = uri_string:parse("foo://usär@host"),
+    {error,invalid_uri,"ö"} = uri_string:parse("//host/path?foö=bar"),
+    {error,invalid_uri,"ö"} = uri_string:parse("//host/path#foö"),
+    {error,invalid_uri,"127.256.0.1"} = uri_string:parse("//127.256.0.1"),
+    {error,invalid_uri,":::127.0.0.1"} = uri_string:parse("//[:::127.0.0.1]"),
+    {error,non_utf8,<<0,0,0,246>>} = uri_string:parse("//%00%00%00%F6").
+
+
 %%-------------------------------------------------------------------------
 %% Recompose tests
 %%-------------------------------------------------------------------------
@@ -807,9 +819,9 @@ transcode_mixed(_Config) ->
         uri_string:transcode(["foo%00", <<"%00%0"/utf32>>,<<"0%F"/utf32>>,"6bar"], [{in_encoding, utf32},{out_encoding, utf8}]).
 
 transcode_negative(_Config) ->
-    {invalid_input,"foo","BX"} =
+    {error,invalid_input,"BX"} =
         uri_string:transcode(<<"foo%C3%BXbar"/utf8>>, [{in_encoding, utf8},{out_encoding, utf32}]),
-    {invalid_input,unicode,<<"ö">>} =
+    {error,invalid_input,<<"ö">>} =
         uri_string:transcode("foo%F6bar", [{in_encoding, utf8},{out_encoding, utf8}]).
 
 compose_query(_Config) ->
@@ -835,5 +847,5 @@ dissect_query_negative(_Config) ->
     {error,urldecode,"&amp;bar"} =
         uri_string:dissect_query("foo1&amp;bar=2"),
     {error,urldecode,"%XX%B6"} = uri_string:dissect_query("foo=%XX%B6&amp;bar=2"),
-    {error,unicode,<<153,182>>} =
+    {error,invalid_input,<<153,182>>} =
         uri_string:dissect_query("foo=%99%B6&amp;bar=2").