- fix some crashes with no store code