[TASK] Bring back the exception code in exception messages