Fixed crash on save due to improper item checks
Tension. Debug. Misc