More defense around NPE