am 40d6c38c: (-s ours) am 0f39c557: Fix to handle IllegalArgumentException

* commit '40d6c38cb489d99e009aa4f5ced1461143143b11':