Make the DoesNotExist structure a little less broken