diff --git a/utils/ccc-analyzer b/utils/ccc-analyzer
index a669e89..6aa03bc 100755
--- a/utils/ccc-analyzer
+++ b/utils/ccc-analyzer
@@ -105,8 +105,12 @@
     push @CmdArgs,'-o';
     push @CmdArgs,$HtmlDir;
   }
-
-   system $Cmd,@CmdArgs;
+  
+  if (defined $ENV{'CCC_UBI'}) {   
+    push @CmdArgs,"--analyzer-viz-egraph-ubigraph";
+  }
+  
+  system $Cmd,@CmdArgs;
 
    # Did the command die because of a signal?
    if ($? & 127 and $Cmd eq $Clang and defined $HtmlDir) {
@@ -188,7 +192,6 @@
 
 # Forward arguments to gcc.
 my $Status = system($CC,@ARGV);
-if ($Status) { exit($Status >> 8); }
 
 # Get the analysis options.
 my $Analyses = $ENV{'CCC_ANALYZER_ANALYSIS'};
@@ -324,8 +327,6 @@
   if (!($Arg =~ /^-/)) {
     push @Files,$Arg; next;
   }
-  
-  exit 0;
 }
 
 if ($Action eq 'compile' or $Action eq 'link') {
@@ -357,3 +358,6 @@
   }
 }
 
+exit($Status >> 8);
+
+