Fix for KT-4683 NPE from Remove Braces