Karolis Skripka added security check + no item found message