Tweaks to error handling and display