Fixed bug when cleaning up null values from ArrayList