Remove potential NPE