Added some error checking ; made use of new 16/32 MCI message handling