Convert empty accountId to null