diff --git a/relman.py b/relman.py
index d222809..2ac8d29 100755
--- a/relman.py
+++ b/relman.py
@@ -97,14 +97,14 @@ def tag(cls, tag):
     def get_branches(cls):
         for branch in run('git', 'branch').split('\n'):
             branch = branch.strip()
-            if not branch.startswith('*'):
+            if len(branch) != 0 and not branch.startswith('*'):
                 yield branch
 
     @classmethod
     def get_remote_branches(cls, remote='origin'):
         for branch in run('git', 'branch', '--remotes').split('\n'):
             branch = branch.strip()
-            if not branch.startswith(remote + '/HEAD -> '):
+            if len(branch) != 0 and not branch.startswith(remote + '/HEAD -> '):
                 yield branch
 
     @classmethod