Added tag validation to pickle handler