Fix issue with null pieces not being set