Don't want for empty tasks.

Close #136 

* Instead of handling this situation uniquely - change the `wait_for_task()` method to check its input