Insert try-catch
Merge remote-tracking branch 'upstream/java-new-client' into client-0.5