Added null checks

NancyFx · Dec 21, 2012 · e0c9edd · e0c9edd
1 parent dfb4b84
commit e0c9edd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Nancy/ViewEngines/DefaultTextResource.cs b/src/Nancy/ViewEngines/DefaultTextResource.cs
@@ -15,14 +15,19 @@ public DefaultTextResource()
             var assemblies = AppDomain.CurrentDomain.GetAssemblies();
 
             culturedAssembly = assemblies.FirstOrDefault(x => x.GetManifestResourceNames().Any(y => y.Contains("Text.")));
-
-            resourceManager = new ResourceManager(culturedAssembly.GetName().Name + ".Resources.Text", culturedAssembly);
+            if (culturedAssembly != null)
+            {
+                resourceManager = new ResourceManager(culturedAssembly.GetName().Name + ".Resources.Text",
+                                                      culturedAssembly);
+            }
         }
 
         public string this[string key, NancyContext context]
         {
             get
             {
+                if (resourceManager == null)
+                    return null;
 
                 return resourceManager.GetString(key, context.Culture);
             }