Fix "looser throw..." error when building RELEASE

Change-Id: I756b51cb4b70db542d6c751a9b0571832b8b7b2e