And declare exception class properly...
Merge branch 'maplayer_thumb_fix' into link_fix