indraneel | #925 |  adding null checks in disposition