Add extra default logic sanity check