diff --git a/base/cartesian.jl b/base/cartesian.jl
index f4e90fc83e5334..b765cded4b95e2 100644
--- a/base/cartesian.jl
+++ b/base/cartesian.jl
@@ -224,6 +224,8 @@ function poplinenum(ex::Expr)
             return ex.args[1]
         elseif length(ex.args) == 2 && isa(ex.args[1], LineNumberNode)
             return ex.args[2]
+        elseif (length(ex.args) == 2 && isa(ex.args[1], Expr) && ex.args[1].head == :line)
+            return ex.args[2]
         end
     end
     ex
diff --git a/base/replutil.jl b/base/replutil.jl
index 3e444f91b770c6..cea8538946eb49 100644
--- a/base/replutil.jl
+++ b/base/replutil.jl
@@ -345,7 +345,7 @@ function show_trace_entry(io, fname, file, line, inlinedfile, inlinedline, n)
 
     if (inlinedfile != symbol(""))
         print(io, " at ", inlinedfile, ":", inlinedline)
-        print(io, " \n    [ thrown by inlined function defined at ]\n    ")
+        print(io, " \n    by code inlined from:   \n")
     else
         print(io, " at ")
     end