Fix snapshotting with no rowsets from API
Fix api calls getting stuck in queue

Signed-off-by: David Fisher <deiform87@gmail.com>