Toolbarcontroller throws some meaningful errors now

Change-Id: Idc0e4c40187fed49b3b1f73151cebe2481b2f027
Merge "Toolbarcontroller throws some meaningful errors now"