Tweaked error handling slightly for validator