Fix NPE's with new creation system