Added nullchecks to hopefully stop the cavedecor crashes