Preventing an endless loop while fetching site infos
Merge pull request #1051 from annando/master

Preventing an endless loop while fetching site infos