Fixed a NPE issue during concatentation