Bug 1060834

Improved messaging.