changed exception handling for client graph enhancement