FIX: NPE control.