Add more checks, debug data