Add some guards around nothing coming back