Added some checks to properly inform the user as to what data is missing.
Authored by: bugman 2010-05-11
Parent: [r11184]
Child: [r11186]
