Sonia - Added custom exception and handling it only in ODL