Fixed as recommended in changeset:   8320:b07165add61b.

Also added a test to exercise this case and make sure an error was reported to the user.

Thanks for reporting this and the fix Christof.

Also do you have commit rights to the repo? If so feel free to take the ticket and
commit changes like this in the future.