Fixed NPE (IDL-2)