#2092 Solving null pointer exception and isalate Salesforge custom code