[#217] Broaden custom exception usage