Merge pull request #605 from scraperwiki/whitespace-errs

Add missing error checks to custard
WIP NO MERGE: Experiments with fixing modal races