renames and improved exception handling