diff --git a/src/modules/milestones.coffee b/src/modules/milestones.coffee
index d8e3808..f3abb66 100644
--- a/src/modules/milestones.coffee
+++ b/src/modules/milestones.coffee
@@ -11,10 +11,10 @@ module.exports =
             # GitHub errors?
             return cb data.message if data.message
             # Empty warning?
-            return cb null, 'No open milestones for repo' unless data.length
+            return cb null, "No open milestones for repo #{repo.path}" unless data.length
             # The first milestone should be ending soonest.
             m = data[0]
             # Empty milestone?
-            return cb null, 'No issues for milestone' if m.open_issues + m.closed_issues is 0
+            return cb null, "No issues for milestone #{m.title}" if m.open_issues + m.closed_issues is 0
             
             cb null, null, m
\ No newline at end of file
diff --git a/test/milestones.coffee b/test/milestones.coffee
index eb4f17b..79dea0d 100644
--- a/test/milestones.coffee
+++ b/test/milestones.coffee
@@ -55,9 +55,9 @@ module.exports =
         req.all_milestones = (opts, cb) ->
             cb null, []
 
-        milestones.get_current {}, (err, warn, milestone) ->
+        milestones.get_current { path: 'some/repo' }, (err, warn, milestone) ->
             assert.ifError err
-            assert.equal warn, 'No open milestones for repo'
+            assert.equal warn, 'No open milestones for repo some/repo'
             do done
 
     'milestones - get current when not found': (done) ->
@@ -72,6 +72,7 @@ module.exports =
         req.all_milestones = (opts, cb) ->
             cb null, [
                 {
+                    'title': 'No issues'
                     'number': 1
                     'created_at': '2013-01-01T00:00:00Z'
                     'due_on': '2013-02-01T00:00:00Z',
@@ -82,5 +83,5 @@ module.exports =
 
         milestones.get_current {}, (err, warn, milestone) ->
             assert.ifError err
-            assert.equal warn, 'No issues for milestone'
+            assert.equal warn, 'No issues for milestone No issues'
             do done
\ No newline at end of file