Marginal improvement to error/warning messages
Fix broken patch for defaulting 0-sampling-intervals to 1