Potential crash fix, either way should have a better error message now