CF-177: add checks for atom ns