Prepare for replacement of if statements checking message type with assertions and proper notification messages provided by ErrorHandler
