Adjust thrown exception types and test checks to container error handling changes