Handling killed bundles
Indendation fixes
Handling NPE