Merge "Add check preventing div0 issue"