--- a/mx/mx_graal.py	Sun Apr 26 20:50:30 2015 -0700
+++ b/mx/mx_graal.py	Mon Apr 27 20:01:10 2015 -0700
@@ -601,6 +601,8 @@
 
 def _classifyGraalServices(classNames, graalJars):
     classification = {}
+    if not classNames:
+        return classification
     for className in classNames:
         classification[className] = None
     javap = mx.java().javap
@@ -680,14 +682,17 @@
                     assert serviceName and member == 'META-INF/services/' + serviceName
                     with zf.open(member) as serviceFile:
                         serviceImpls = servicesMap.setdefault(serviceName, [])
-                        serviceImpls.extend(serviceFile.readlines())
+                        for line in serviceFile.readlines():
+                            line = line.strip()
+                            if line:
+                                serviceImpls.append(line)
     graalServices = _filterGraalService(servicesMap.keys(), graalJars)
     for serviceName in graalServices:
         serviceImpls = servicesMap[serviceName]
         fd, tmp = tempfile.mkstemp(prefix=serviceName)
         f = os.fdopen(fd, 'w+')
         for serviceImpl in serviceImpls:
-            f.write(serviceImpl.rstrip() + os.linesep)
+            f.write(serviceImpl + os.linesep)
         target = join(destination, serviceName)
         f.close()
         shutil.move(tmp, target)