Fix for Ticket 2400

Addresses comment @
https://github.com/buildbot/buildbot/pull/595#issuecomment-11754868