A little more debugging info and error checking

Original commit message from CVS:
A little more debugging info and error checking
2 files changed