[PAXEXAM-563] Fix for NPE when bundle gets reloaded