Card #105 removed possible NPE