Don't try and use client_application if we didn't find it

Replaces #125.