Thanks for helping me find all the ways it could fail.  I've pushed another fix (the 13th fix since I thought I was finished!)