LPS-41092 Fixed CCE being thrown

Fix for https://issues.liferay.com/browse/LPS-41092