diff --git a/test/bytecode_3.8/02_tryfinally_return.pyc b/test/bytecode_3.8/02_tryfinally_return.pyc
new file mode 100644
index 00000000..9b946df3
Binary files /dev/null and b/test/bytecode_3.8/02_tryfinally_return.pyc differ
diff --git a/test/bytecode_3.8/03_if_try.pyc b/test/bytecode_3.8/03_if_try.pyc
new file mode 100644
index 00000000..949b68b1
Binary files /dev/null and b/test/bytecode_3.8/03_if_try.pyc differ
diff --git a/uncompyle6/parsers/parse38.py b/uncompyle6/parsers/parse38.py
index 665784d5..ca148fca 100644
--- a/uncompyle6/parsers/parse38.py
+++ b/uncompyle6/parsers/parse38.py
@@ -30,6 +30,7 @@ class Python38Parser(Python37Parser):
         stmt               ::= forelselaststmt38
         stmt               ::= forelselaststmtl38
         stmt               ::= tryfinally38
+        stmt               ::= try_except_ret38
 
         # FIXME this should be restricted to being inside a try block
         stmt               ::= except_ret38
@@ -59,9 +60,14 @@ class Python38Parser(Python37Parser):
                                POP_EXCEPT
         try_except         ::= SETUP_FINALLY suite_stmts_opt POP_BLOCK
                                except_handler38
+        try_except_ret38   ::= SETUP_FINALLY expr POP_BLOCK
+                               RETURN_VALUE except_ret38a
         except_ret38       ::= SETUP_FINALLY expr ROT_FOUR POP_BLOCK POP_EXCEPT
                                CALL_FINALLY RETURN_VALUE COME_FROM_FINALLY
                                suite_stmts_opt END_FINALLY
+        except_ret38a      ::= COME_FROM_FINALLY POP_TOP POP_TOP POP_TOP
+                               expr ROT_FOUR
+                               POP_EXCEPT RETURN_VALUE END_FINALLY
         except_handler38   ::= JUMP_FORWARD COME_FROM_FINALLY
                                except_stmts END_FINALLY opt_come_from_except
         tryfinallystmt     ::= SETUP_FINALLY suite_stmts_opt POP_BLOCK
@@ -74,6 +80,9 @@ class Python38Parser(Python37Parser):
                                returns
                                COME_FROM_FINALLY POP_FINALLY returns
                                END_FINALLY
+        tryfinally_return_stmt ::= SETUP_FINALLY suite_stmts_opt POP_BLOCK
+                                   BEGIN_FINALLY COME_FROM_FINALLY
+                                   POP_FINALLY suite_stmts_opt END_FINALLY
 
         """
 
@@ -85,7 +94,7 @@ class Python38Parser(Python37Parser):
         self.remove_rules("""
            stmt               ::= for
            stmt               ::= forelsestmt
-           stmt               ::= try_except36
+           stmt               ::= try_except38
 
            for                ::= SETUP_LOOP expr for_iter store for_block POP_BLOCK
            for                ::= SETUP_LOOP expr for_iter store for_block POP_BLOCK NOP
@@ -101,6 +110,9 @@ class Python38Parser(Python37Parser):
                                   END_FINALLY
            tryfinally36       ::= SETUP_FINALLY returns
                                   COME_FROM_FINALLY suite_stmts_opt END_FINALLY
+           tryfinally_return_stmt ::= SETUP_FINALLY suite_stmts_opt POP_BLOCK
+                                      LOAD_CONST COME_FROM_FINALLY
+
 
         """)
         super(Python37Parser, self).customize_grammar_rules(tokens, customize)
diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py
index 8fedcc61..76ebd324 100644
--- a/uncompyle6/semantics/customize3.py
+++ b/uncompyle6/semantics/customize3.py
@@ -963,11 +963,17 @@ def customize_for_version3(self, version):
                             (2, 'store'),
                             (0, 'expr'),
                             (3, 'for_block'), -2 ),
-                        'tryfinally38':  ( '%|try:\n%+%c%-%|finally:\n%+%c%-\n\n',
+                        'tryfinally38': (
+                            '%|try:\n%+%c%-%|finally:\n%+%c%-\n\n',
                                    (3, 'returns'), 6 ),
                         'except_ret38':  ( '%|return %c\n', (1, 'expr') ),
+                        'try_except_ret38': (
+                            '%|try:\n%+%|return %c%-\n%|except:\n%+%|%c%-\n\n',
+                                   (1, 'expr'), (-1, 'except_ret38a') ),
+                        'except_ret38a': (
+                            'return %c', (4, 'expr') )
                     })
-                    pass
+                    pass  # version >= 3.8
                 pass
 
             pass # version >= 3.6
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index b79b902d..773e2307 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -1860,7 +1860,7 @@ class SourceWalker(GenericASTTraversal, object):
                 index = entry[arg]
                 if isinstance(index, tuple):
                     assert node[index[0]] == index[1], (
-                        "at %s[%d], expected %s node; got %s" % (
+                        "at %s[%d], expected '%s' node; got '%s'" % (
                             node.kind, arg,  index[1], node[index[0]].kind)
                         )
                     index = index[0]