Proper tested fix for borer client crashes.