Check if catalogue is already loaded
Merge pull request #332 from erwinwinder/master

 Check if catalogue is already loaded