Fix division by zero and check for isFinite() to fix comparator issue…

Fix division by zero and check for isFinite() to fix comparator issue… #1214