Error messaging improvements