Circularity saw at Rakudo level

circ-saw.pl

diff --git a/src/Perl6/ModuleLoader.pm b/src/Perl6/ModuleLoader.pm
index 26d7fe7..0a0c005 100644
--- a/src/Perl6/ModuleLoader.pm
+++ b/src/Perl6/ModuleLoader.pm
@@ -140,9 +140,12 @@ class Perl6::ModuleLoader {
                 my %*COMPILING := {};
                 my $*CTXSAVE := self;
                 my $*MAIN_CTX;
-                pir::load_bytecode(%chosen<load>);
                 %modules_loaded{%chosen<key>} := $module_ctx := $*MAIN_CTX;
+                pir::load_bytecode(%chosen<load>);
                 DEBUG("done loading ", %chosen<load>) if $DEBUG;
+                CATCH {
+                    nqp::deletekey(%modules_loaded, %chosen<key>);
+                }
             }
             else {
                 # Read source file.