Fixes if XCMS did not find any peaks

Hi, 
please merge this set of small fixes, which are mainly sanity checks
Yours,
Erik and Steffen