diff --git a/src/memory/memory.py b/src/memory/memory.py
index 446d43a2..155a8ed9 100644
--- a/src/memory/memory.py
+++ b/src/memory/memory.py
@@ -461,9 +461,11 @@ class Memory(object):
         @return: Deferred
         """
         if not name:
-            raise ValueError("Empty profile name")
+            raise ValueError(u"Empty profile name")
         if name[0] == '@':
-            raise ValueError("A profile name can't start with a '@'")
+            raise ValueError(u"A profile name can't start with a '@'")
+        if '\n' in name:
+            raise ValueError(u"A profile name can't contain line feed ('\\n')")
 
         if name in self._entities_cache:
             raise exceptions.ConflictError(u"A session for this profile exists")