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

* commit 'e7601cc8515af53d693a260161099e3ee394e484':