Hard failure instead of graceful, from feedback provided by vitaly