* Added more and better error checking which should fix 'potential'
  bugs or weird behavior in case something goes wrong.  We aim for
  something that is rock-solid, right? :-)