Better error checking, getting 60 ms to work again
2 files changed