LOW: Cautious Null check
LOW: Prevented IllegalArgumentException