Make the fetching fire-proof
Fixed a typo