Added failguard
Merge branch 'dev2' into shoppingCart