Avoid NPE + comment