Fix Null Key In Entry