diff --git a/src/proper_erlang_abstract_code.erl b/src/proper_erlang_abstract_code.erl
index 726d95e2..a610ea4f 100644
--- a/src/proper_erlang_abstract_code.erl
+++ b/src/proper_erlang_abstract_code.erl
@@ -67,6 +67,8 @@
 %%% '''
 -module(proper_erlang_abstract_code).
 
+-compile({no_auto_import, [is_record/1]}).
+
 -export([module/0, module/1, guard/0, guard/1, expr/0, expr/1]).
 
 -export([term/0, term/1]).
diff --git a/src/proper_statem.erl b/src/proper_statem.erl
index 98bf6766..d4b48434 100644
--- a/src/proper_statem.erl
+++ b/src/proper_statem.erl
@@ -767,7 +767,18 @@ pmap(F, L) ->
 		 [command_list()]) -> [pid()].
 spawn_jobs(F, L) ->
     Parent = self(),
-    [spawn_link_cp(fun() -> Parent ! {self(),catch {ok,F(X)}} end) || X <- L].
+    [spawn_link_cp(fun() ->
+			    Msg = try {ok, F(X)} of
+				    V -> V
+				catch
+				    throw:T -> T;
+				    exit:Reason -> {'EXIT', Reason};
+				    error:Reason:Stacktrace ->
+					{'EXIT', {Reason, Stacktrace}}
+				end,
+			  Parent ! {self(), Msg}
+		  end)
+     || X <- L].
 
 -spec await([pid()]) -> [parallel_history()].
 await([]) -> [];
diff --git a/test/ets_counter.erl b/test/ets_counter.erl
index a1fc12b3..9012f291 100644
--- a/test/ets_counter.erl
+++ b/test/ets_counter.erl
@@ -81,7 +81,7 @@ set_up() ->
     ok.
 
 clean_up() ->
-    catch ets:delete(counter).
+    try ets:delete(counter) catch _:_ -> ok end.
 
 key() ->
     elements(?KEYS).
diff --git a/test/ets_statem_test.erl b/test/ets_statem_test.erl
index d02f0b76..5c3d1e2e 100644
--- a/test/ets_statem_test.erl
+++ b/test/ets_statem_test.erl
@@ -228,7 +228,7 @@ prop_ets() ->
     ?FORALL(Type, noshrink(table_type()),
         ?FORALL(Cmds, commands(?MODULE, initial_state(Type)),
 	    begin
-		catch ets:delete(?TAB),
+		try ets:delete(?TAB) catch _:_ -> ok end,
 		?TAB = ets:new(?TAB, [Type, public, named_table]),
 		{H,S,Res} = run_commands(?MODULE, Cmds),
 		clean_up(),
@@ -241,7 +241,7 @@ prop_parallel_ets() ->
     ?FORALL(Type, noshrink(table_type()),
         ?FORALL(Cmds, parallel_commands(?MODULE, initial_state(Type)),
 	    begin
-		catch ets:delete(?TAB),
+		try ets:delete(?TAB) catch _:_ -> ok end,
 		?TAB = ets:new(?TAB, [Type, public, named_table]),
 		{Seq,P,Res} = run_parallel_commands(?MODULE, Cmds),
 		?WHENFAIL(
@@ -254,7 +254,7 @@ prop_parallel_ets() ->
 %%% Utility Functions
 
 set_up() ->
-    catch ets:delete(?TAB),
+    try ets:delete(?TAB) catch _:_ -> ok end,
     Type = lists:nth(proper_arith:rand_int(1, 4),
 		     [set, ordered_set, bag, duplicate_bag]),
     ?TAB = ets:new(?TAB, [Type, public, named_table]).
diff --git a/test/proper_exported_types_test.erl b/test/proper_exported_types_test.erl
index 7b7e801b..9e105d03 100644
--- a/test/proper_exported_types_test.erl
+++ b/test/proper_exported_types_test.erl
@@ -52,7 +52,14 @@ not_handled() ->
   R = [{M,T,A,proper_typeserver:demo_translate_type(M, stringify(T, A))}
        || {M,T,A} <- MTs],
   {OKs,Errors} = lists:partition(fun type_translation_is_ok/1, R),
-  {[Inst || TGen <- OKs, (Inst = pick_instance(TGen)) =/= ok], length(Errors)}.
+  BadInsts = lists:filtermap(
+	       fun(TGen) ->
+		   case pick_instance(TGen) of
+		       ok -> false;
+		       Inst -> {true, Inst}
+		   end
+	       end, OKs),
+  {BadInsts, length(Errors)}.
 
 pick_instance({M,T,A,{ok,Gen}}) ->
   {ok,Inst} = proper_gen:pick(Gen),
diff --git a/test/targeted_fsm.erl b/test/targeted_fsm.erl
index 5b0f84a9..1975875f 100644
--- a/test/targeted_fsm.erl
+++ b/test/targeted_fsm.erl
@@ -91,7 +91,7 @@ non_empty_ets(S) ->
 prop_random() ->
   ?FORALL(Cmds, proper_fsm:commands(?MODULE),
           begin
-            catch ets:delete(?TAB),
+            try ets:delete(?TAB) catch _:_ -> ok end,
             ?TAB = ets:new(?TAB, [set, public, named_table]),
             {H, _S, Res} = proper_fsm:run_commands(?MODULE, Cmds),
             ets:delete(?TAB),
@@ -103,7 +103,7 @@ prop_targeted() ->
   ?FORALL_TARGETED(
      Cmds, proper_fsm:commands(?MODULE),
      begin
-       catch ets:delete(?TAB),
+       try ets:delete(?TAB) catch _:_ -> ok end,
        ?TAB = ets:new(?TAB, [set, public, named_table]),
        {H, {_, S}, Res} = proper_fsm:run_commands(?MODULE, Cmds),
        ets:delete(?TAB),
@@ -116,7 +116,7 @@ prop_targeted_init() ->
   ?FORALL_TARGETED(
      Cmds, proper_fsm:commands(?MODULE, {empty_ets, []}),
      begin
-       catch ets:delete(?TAB),
+       try ets:delete(?TAB) catch _:_ -> ok end,
        ?TAB = ets:new(?TAB, [set, public, named_table]),
        {H, {_, S}, Res} = proper_fsm:run_commands(?MODULE, Cmds),
        ets:delete(?TAB),
diff --git a/test/targeted_statem.erl b/test/targeted_statem.erl
index 4e357f93..89bbb897 100644
--- a/test/targeted_statem.erl
+++ b/test/targeted_statem.erl
@@ -86,7 +86,7 @@ postcondition(_S, _C, _R) -> true.
 prop_random() ->
   ?FORALL(Cmds, commands(?MODULE),
           begin
-            catch ets:delete(?TAB),
+            try ets:delete(?TAB) catch _:_ -> ok end,
             ?TAB = ets:new(?TAB, [set, public, named_table]),
             {_H, _S, Res} = run_commands(?MODULE, Cmds),
             ets:delete(?TAB),
@@ -96,7 +96,7 @@ prop_random() ->
 prop_targeted() ->
   ?FORALL_TARGETED(Cmds, commands(?MODULE),
                    begin
-                     catch ets:delete(?TAB),
+                     try ets:delete(?TAB) catch _:_ -> ok end,
                      ?TAB = ets:new(?TAB, [set, public, named_table]),
                      {_H, S, Res} = run_commands(?MODULE, Cmds),
                      ets:delete(?TAB),
@@ -107,7 +107,7 @@ prop_targeted() ->
 prop_targeted_init() ->
   ?FORALL_TARGETED(Cmds, commands(?MODULE, []),
                    begin
-                     catch ets:delete(?TAB),
+                     try ets:delete(?TAB) catch _:_ -> ok end,
                      ?TAB = ets:new(?TAB, [set, public, named_table]),
                      {_H, S, Res} = run_commands(?MODULE, Cmds),
                      ets:delete(?TAB),