Fixing bundle exceptions on building messages