Handle assumption failures correctly, fixes #6