Reverted toolbarcontroller and added a new error message