Work around NoneType error in build.sh:bootstrap (Fixes #522)