Add checks for no nodes so that request complete
0.0.9