Clean up useless ex variable

When handle exception, if the exception was not used, then there is
no need to use "except Exception as ex", just using "except ValueError"
is good enough.

Change-Id: I495e239cbca20246cb88da166a80bbd4eda1a094
Merge "Clean up useless ex variable"