Ah, now I got the error to run. My original fix was right, except I forgot one lousy "return"! I'll have that patched in a bit.
It looks like I accidentally left Block un-shown. I'll do something about that in the next patch as well.
