Add null check so that items with null icons do not crash the client.
Merge PR #1400 by @Josharias - prevent crashes from rendering held null icons