diff --git a/Exceptron.Client/ExceptronClient.cs b/Exceptron.Client/ExceptronClient.cs
index 2326459c3..64dc8e880 100644
--- a/Exceptron.Client/ExceptronClient.cs
+++ b/Exceptron.Client/ExceptronClient.cs
@@ -255,11 +255,6 @@ internal static List<Frame> ConvertToFrames(Exception exception)
 
                 var fileName = frame.GetFileName();
 
-                if (!string.IsNullOrWhiteSpace(fileName))
-                {
-                    fileName = new FileInfo(fileName).Name;
-                }
-
                 var currentFrame = new Frame
                 {
                     i = index,
diff --git a/Marr.Data/Mapping/MappingHelper.cs b/Marr.Data/Mapping/MappingHelper.cs
index 5253c4548..ea4b9bb4c 100644
--- a/Marr.Data/Mapping/MappingHelper.cs
+++ b/Marr.Data/Mapping/MappingHelper.cs
@@ -65,8 +65,8 @@ public object LoadExistingEntity(ColumnMapCollection mappings, DbDataReader read
                 }
                 catch (Exception ex)
                 {
-                    string msg = string.Format("The DataMapper was unable to load the following field: '{0}'.",
-                        dataMap.ColumnInfo.Name);
+                    string msg = string.Format("The DataMapper was unable to load the following field: '{0}'. {1}",
+                        dataMap.ColumnInfo.Name, ex.Message);
 
                     throw new DataMappingException(msg, ex);
                 }