Exception handling changes. No more exception wrapping.