Attempts to improve the stability of the grabber
Merge pull request #5 from njx/nj/stability-fixes

Attempts to improve the stability of the grabber