Remarks: Fixed NullPointException