Check against nil blocks.
While I remember, let's do that in the new status code too.
Test expected results for no conflicts.