properly handle missing endpoints.
fixing errors on minimalistic form.