add log, change exception code