Fix for KT-4683 NPE from Remove Braces

After getting the NPE myself I believe this fixes it. I am still not sure why it is happening because I check to make sure expressionKind is not null a few lines before this line. I also got the NPE for Add Braces also coming from the same statement in that class. So I added the fix to it as well.