Version 2 updates

Error handling updates