Using a retry dialog to catch intermittent IllegalArgumentException.
Merge branch 'issue#6' into future