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