[TASK] Avoid unnecessary Exception throw