fixed exception
fixed message building