Remove comment, and alter msg exception