Proper tested fix for borer client crashes.
Merge pull request #6447 from Zuhayr/master

Proper tested fix for borer client crashes.