PLT-482 Add checked exception handling

Clearer Javadoc