Fixed NPE in NODOM mode