Fix NPE in PICA, OA-114