Added null check in property expansion removal code