Tighten exception catching for calls to the master API (more than just IllegalArgumentExceptions are thrown)