@@ -81,18 +81,27 @@ static int dsresult(int sockd, const struct optstruct *opt)

 	    infected++;

 	    logg("%s", buff);

 	    if(optl(opt, "move")) {

-		pt = strrchr(buff, ':');

-		*pt = 0;

-		move_infected(buff, opt);

+		/* filename: Virus FOUND */

+		if((pt = strrchr(buff, ':'))) {

+		    *pt = 0;

+		    move_infected(buff, opt);

+		} else {

+		    mprintf("@Broken data format. File not moved.\n");

+		}

 	    } else if(optl(opt, "remove")) {

-		pt = strrchr(buff, ':');

-		*pt = 0;

-		if(unlink(buff)) {

-		    logg("%s: Can't remove.\n", buff);

-		    notremoved++;

+		if(!(pt = strrchr(buff, ':'))) {

+		    mprintf("@Broken data format. File not removed.\n");

 		} else {

-		    logg("%s: Removed.\n", buff);

+		    *pt = 0;

+		    if(unlink(buff)) {

+			mprintf("%s: Can't remove.\n", buff);

+			logg("%s: Can't remove.\n", buff);

+			notremoved++;

+		    } else {

+			mprintf("%s: Removed.\n", buff);

+			logg("%s: Removed.\n", buff);

+		    }

 		}

 	    }

 	}