Make adapter more resilient by not assuming there is a path