Added some checks, including abandon.