Bakery startup safety fix.
Merge pull request #143 from ly29/master

Bakery startup safety fix.