Handling killed bundles
Merge
Indendation fixes
Merged
Handling killed bundles
Indendation fixes
Handling NPE
Handling NPE