Minor cleanup to error messages in MessageMap and scheduler