Fix for hydration with 'empty' identifiers

Should fix #456 
So I'm not entirely sure that this is the correct way to go with this. But I don't think that we really need to check if the data is empty here anyway.