LPS-34075 Null pointer and fix logic
LPS-34075 Source formatting