EMI: address review comment and adjust warning message