Avoid propagating exception on bad expansion
Merge branch 'rescue_expansion'