Fix for bug 989650, bug 988115, and added additional check in oo-admin-chk