Avoid possible NPE seen in dev instance