indraneel | #1195 | fixing null pointer exceptions