Fixed Message exception bug