Fix null-guids.. shouldn't be possible, just to be sure