Fix bug an exception is thrown after forget to return