Additional safety for empty items