A bit refactoring and protection against multiparts throwing a NPE when Item#getSubItems() gets a call.