daurnimator Merge branch 'dont-throw'