Easier error handling and passport cooperation