am 0f39c557: Fix to handle IllegalArgumentException

* commit '0f39c5571184dbd941a40781e6204630ec4f89eb':
  Fix to handle IllegalArgumentException