Fixed the bug with null-ID-ed props