Merge

1 files changed, 2 insertions, 1 deletions

diff --git a/Source/ModelViewer/Namer.cs b/Source/ModelViewer/Namer.cs
index 1006c658..c1d7fcd3 100644
--- a/Source/ModelViewer/Namer.cs
+++ b/Source/ModelViewer/Namer.cs
@@ -106,6 +106,7 @@ namespace Microsoft.Boogie.ModelViewer
     public virtual string CanonicalName(Model.Element elt)

     {

       string res;

+      if (elt == null) return "?";

       if (canonicalName.TryGetValue(elt, out res)) return res;

       NameSeqSuffix suff;

       var baseName = CanonicalBaseName(elt, out suff);

@@ -230,7 +231,7 @@ namespace Microsoft.Boogie.ModelViewer
       for (int i = 0; i < len; ++i) {

         var c1 = f1[i];

         var c2 = f2[i];

-        if ('0' <= c1 && c1 <= '9' && '0' <= c2 && c2 <= '9') {
+        if ('0' <= c1 && c1 <= '9' && '0' <= c2 && c2 <= '9') {

           numberPos = i;

           break;

         }