Index: Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/ProfileLocationReader.cs
===================================================================
diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -rbd0179e92bcc6367c2760df65b80b08e52acbb86
--- Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/ProfileLocationReader.cs	(.../ProfileLocationReader.cs)	(revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/ProfileLocationReader.cs	(.../ProfileLocationReader.cs)	(revision bd0179e92bcc6367c2760df65b80b08e52acbb86)
@@ -120,7 +120,13 @@
         /// </summary>
         /// <param name="shapeFilePath">Shape file path.</param>
         /// <exception cref="ArgumentException">Thrown when <paramref name="shapeFilePath"/> is invalid.</exception>
-        /// <exception cref="CriticalFileReadException">Shapefile does not only contain point features.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when
+        /// <list type="bullet">
+        /// <item><paramref name="shapeFilePath"/> points to a file that doesn't exist.</item>
+        /// <item>The shapefile has non-point geometries in it.</item>
+        /// <item>An unexpected error occurred when reading the shapefile.</item>
+        /// </list>
+        /// </exception>
         /// <returns>Return an instance of <see cref="PointShapeFileReader"/>.</returns>
         private static PointShapeFileReader OpenPointsShapeFile(string shapeFilePath)
         {
@@ -130,9 +136,14 @@
             }
             catch (CriticalFileReadException e)
             {
-                string message = new FileReaderErrorMessageBuilder(shapeFilePath)
-                    .Build(Resources.ProfileLocationReader_OpenPointsShapeFile_File_can_only_contain_points);
-                throw new CriticalFileReadException(message, e);
+                if (e.InnerException.GetType() == typeof(ApplicationException))
+                {
+                    string message = new FileReaderErrorMessageBuilder(shapeFilePath)
+                        .Build(Resources.ProfileLocationReader_OpenPointsShapeFile_File_can_only_contain_points);
+                    throw new CriticalFileReadException(message, e);
+                }
+
+                throw;
             }
         }