This should in theory also fix a crash when an invalid xpath is specified (maybe @Akshay Kumar can tune in and tell us more)