Fixed Normalizer className, Added error handling