Merge pull request #2417 from razzfazz/guard_substr