[TASK] A few error prevention measures