@yrliou
Fix missing returns in error cases
81590b7