Fixed DoesNotExist handling.