Commented out and made Exception changes