Revert error handling change

This also brings master fully up to date with development.