error handling updates to base modules