Update: replace throw with a devbuild-conditional error log This is a cirtical code path, so we can't interrupt it or we'll corrupt global state. Think I see where the problem is coming from, will attempt to fix next Tests: none, trivial change