Merge pull request #1883 from shackbarth/24607
authorTravis Webb <me@traviswebb.com>
Mon, 6 Oct 2014 18:03:32 +0000 (14:03 -0400)
committerTravis Webb <me@traviswebb.com>
Mon, 6 Oct 2014 18:03:32 +0000 (14:03 -0400)
issue #24607: make sure we hit the proper error message


Trivial merge