From f9aade23afd8471b5501bb3fb158543ffccae88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Fri, 27 Feb 2015 18:40:06 +0000
Subject: morphlib/morphloader.py: Add a check to load_from_string()

---
 morphlib/morphloader.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index d257dced..e0f0952b 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -398,13 +398,17 @@ class MorphologyLoader(object):
 
         return morphlib.morphology.Morphology(obj)
 
-    def load_from_string(self, string, filename='string'):
+    def load_from_string(self, string,
+                         filename='string'):  # pragma: no cover
         '''Load a morphology from a string.
 
         Return the Morphology object.
 
         '''
 
+        if string is None:
+            return None
+
         m = self.parse_morphology_text(string, filename)
         m.filename = filename
         self.validate(m)
-- 
cgit v1.2.1