diff --git a/ChangeLog b/ChangeLog
index 24acb8f31..690d07426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-22  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftoutln.c (FT_Outline_Decompose): Improve error tracing.
+
 2018-04-22  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	[base] Fix bitmap emboldening.
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 9c29ade92..cb91321de 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -286,12 +286,13 @@
     FT_TRACE5(( "FT_Outline_Decompose: Done\n", n ));
     return FT_Err_Ok;
 
+  Invalid_Outline:
+    error = FT_THROW( Invalid_Outline );
+    /* fall through */
+
   Exit:
     FT_TRACE5(( "FT_Outline_Decompose: Error 0x%x\n", error ));
     return error;
-
-  Invalid_Outline:
-    return FT_THROW( Invalid_Outline );
   }