Fixes: ConstraintViolationException: Column 'CITIZENSHIP_TYPE_CODE' cannot be null