More robust handling of errors, use global error notices, fix the button on the global notices being wrong