Escaped $ to prevent NPE.
Added simple syntax scanner to find which file has NPE