Fix problem with message handler discovery and calling.