suppress error messages better
swap order of notifications