fix JsonNull exception. collect also device info