Add empty strings to try to prevent NPE