Changed the way DoesNotExist exceptions are handled