Cosmetics: if(x != NULL) -> if(x)