Merge "rot: add null checks before calling release API"