indraneel | adding null pointer checks for disposition