Minor tweaks to exception throwing