Minor tweaks to status and error