Updating so will not crash if query returns nothing