Gittrac #4091:  Improved warning message and changed the test to match.