diff --git a/genotyping/src/org/labkey/genotyping/view/haplotypeAssignmentReport.jsp b/genotyping/src/org/labkey/genotyping/view/haplotypeAssignmentReport.jsp
index afc62e63..71a379dd 100644
--- a/genotyping/src/org/labkey/genotyping/view/haplotypeAssignmentReport.jsp
+++ b/genotyping/src/org/labkey/genotyping/view/haplotypeAssignmentReport.jsp
@@ -213,10 +213,13 @@
 
             getIdInClauseStr: function(idArr)
             {
+                if (!idArr || idArr.length === 0)
+                    return "NULL";
+
                 var str = "";
                 var sep = "";
                 Ext4.each(idArr, function(id){
-                    str += sep + "'" + id + "'";
+                    str += sep + "'" + id.replace(/'/g, "''") + "'";
                     sep = ", ";
                 });
                 return str;