Fix for possible NPE.
Added new method to Util, and aCis-321 patch updated.