handle error
Merge branch 'develop' of github.com:dreid93/bakery into develop