Tweaks in exception handling
Tweaks in retrieving listings