Move better error and binding of caller to all environments