ALM-649 added custom_error back in