Revert "Return explicitly when raise exception"

This reverts commit 84075573e482cdf4ab239db864d71c9fec7f871f.