Added callback checks.