Fixed Graph + ErrorHandling