Update FabTable - Added null check