Behavior change

Instead of exception, automatically set to custom origin