Add Hashie back in and fix some error handling