[TASK] Change return NULL to simple return for consistency