LOW: fixing a header comment
LOW: preventing NPE