Error handling and generators with WikiMapia added.