added missing parameter for afterBinding() call
converted error states/logs to throw's, misc cleanup