Small changes & prevent exception