change in error handling
changes for contextualization