Martin Yde - #8394, Added error messages