Fix additional bug with empty message types.