Fixed JS error on showing errors in customActionClicked

Conflicts:

	main/core/ChangeLog