Addtl. exception handling. New labeling for graphs.