adding better errors and binding of caller