Be more permissive in retrieve_proposal_for

I initially thought raising exceptions there was reasonable, but this is
probably too brutal. Instead, use some fallback.
Merge pull request #883 from vuntz/retrieve_proposal_for

Be more permissive in retrieve_proposal_for