Fixed a crash-on-exit problem in weaver caused by jdcormie's