diff -r 7676bcaa1f95 -r fd54c15231d3 src/HOL/Tools/TFL/dcterm.ML
--- a/src/HOL/Tools/TFL/dcterm.ML	Mon Jun 01 15:39:53 2015 +0200
+++ b/src/HOL/Tools/TFL/dcterm.ML	Mon Jun 01 16:07:38 2015 +0200
@@ -175,18 +175,12 @@
  * Going into and out of prop
  *---------------------------------------------------------------------------*)
 
-fun mk_prop ctm =
-  let
-    val thy = Thm.theory_of_cterm ctm;
-    val t = Thm.term_of ctm;
-  in
-    if can HOLogic.dest_Trueprop t then ctm
-    else Thm.global_cterm_of thy (HOLogic.mk_Trueprop t)
-  end
-  handle TYPE (msg, _, _) => raise ERR "mk_prop" msg
-    | TERM (msg, _) => raise ERR "mk_prop" msg;
+fun is_Trueprop ct =
+  (case Thm.term_of ct of
+    Const (@{const_name Trueprop}, _) $ _ => true
+  | _ => false);
 
-fun drop_prop ctm = dest_monop @{const_name Trueprop} ctm handle Utils.ERR _ => ctm;
-
+fun mk_prop ct = if is_Trueprop ct then ct else Thm.apply @{cterm Trueprop} ct;
+fun drop_prop ct = if is_Trueprop ct then Thm.dest_arg ct else ct;
 
 end;