diff --git a/scrot/src/main.c b/scrot/src/main.c
index 544715e..602308c 100644
--- a/scrot/src/main.c
+++ b/scrot/src/main.c
@@ -164,9 +164,13 @@ scrot_exec_app(Imlib_Image image, struct tm *tm,
                char *filename_im, char *filename_thumb)
 {
   char *execstr;
+  int ret = 0;
 
   execstr = im_printf(opt.exec, tm, filename_im, filename_thumb, image);
-  system(execstr);
+  ret = system(execstr);
+  if (ret < 0)
+    exit(1);
+
   exit(0);
 }
 
@@ -321,7 +325,8 @@ scrot_sel_and_grab_image(void)
       /* get geometry of window and use that */
       /* get windowmanager frame of window */
       if (target != root) {
-        unsigned int d, x;
+        int x;
+        unsigned int d;
         int status;
 
         status = XGetGeometry(disp, target, &root, &x, &x, &d, &d, &d, &d);