make watch actually return an error when there's an error
Treat super short watches with no items received the same as watches that error immediately
Merge pull request #1389 from lavalamp/scheduler

make watch actually return an error when there's an error