It's about to get more complicated - let's alter the logic to handle
various failures. Adds saving of the error as well.