Added debug exception and did renames.