Slightly less threatening error description, and add stack trace
Merge bug26362
stable to default