Summary: Add the check and return immediately if it's false
Reviewed-by: anthony, mchung, sla
Contributed-by: NNicolas Carranza <nicarran@gmail.com>