Merge "Don't let toasting throw a runtime exception." into oc-dev