Commit c48e87006cce65a8b69f60e0a38a9ac18b82366d

Ben Straub 2012-10-31T10:13:57

Ensure that non-error is not propagated