[TASK] Make Exception message more helpful