Merge "Refactor: handle unparsable longs"