Fixed a few issues with NPEs in dynamic tab names