Improve error checking; grocery hot-fix