diff --git a/tools/memap.py b/tools/memap.py
index a2efd0e230..0b468f8a59 100644
--- a/tools/memap.py
+++ b/tools/memap.py
@@ -274,9 +274,13 @@ class MemapParser(object):
                     section = '.data'
                 elif test_re_armcc.group(3) == 'Zero':
                     section = '.bss'
+                elif test_re_armcc.group(3) == 'Code':
+                    section = '.text'
                 else:
-                    print "Malformed input found when parsing armcc map: %s" %\
-                          line
+                    print "Malformed input found when parsing armcc map: %s, %r" %\
+                          (line, test_re_armcc.groups())
+
+                    return ["", 0, ""]
 
             # check name of object or library
             object_name = self.parse_object_name_armcc(\