diff --git a/src/mapdraw.c b/src/mapdraw.c
index 137ca20ae..af6af9a2a 100644
--- a/src/mapdraw.c
+++ b/src/mapdraw.c
@@ -342,7 +342,7 @@ imageObj *msDrawMap(mapObj *map, int querymap) {
       if (*filename == '\0') {
         msSetError(MS_IOERR, "Invalid SLD filename: \"%s\".",
                    "msLayerGetFeatureStyle()", lp->styleitem);
-        return MS_FAILURE;
+        return (NULL);
       }
 
       msSLDApplyFromFile(map, lp, filename);
@@ -1132,8 +1132,8 @@ int msDrawVectorLayer(mapObj *map, layerObj *layer, imageObj *image) {
 
   /* build item list. STYLEITEM javascript needs the shape attributes */
   if (layer->styleitem &&
-          (strncasecmp(layer->styleitem, "javascript://", 13) == 0) ||
-      (strncasecmp(layer->styleitem, "sld://", 6) == 0)) {
+      ((strncasecmp(layer->styleitem, "javascript://", 13) == 0) ||
+       (strncasecmp(layer->styleitem, "sld://", 6) == 0))) {
     status = msLayerWhichItems(layer, MS_TRUE, NULL);
   } else {
     status = msLayerWhichItems(layer, MS_FALSE, NULL);