Improve the error message when a substitute/extract property fails
Improve the error message when a substitute/extract property fails

ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake