diff --git a/Makefile b/Makefile
index 5ac154f..3c59e8b 100755
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ $(eval $(call make-binaryobj-rule,$(bin),$(obj)))))
 define make-binary-rules
  $1$(if $(FOR_WINDOWS),.exe): $(SRC_$1:%=$(OBJDIR)/$1/%.o) | $(OBJDIR)/$1
 	$(call bcmd,ld,$$@,$(LD) -o $$@ $$^ $(LDFLAGS_$1))
- all-$1: $1$(if $(FOR_WINDOWS),.exe)
+ all-$1: $(CHECKCFG) $1$(if $(FOR_WINDOWS),.exe)
 
  clean-$1:
 	$(call rmsg,Removing $1 and its objects directory.)
diff --git a/src/p7/main.c b/src/p7/main.c
index 7038720..85a5ba3 100644
--- a/src/p7/main.c
+++ b/src/p7/main.c
@@ -186,7 +186,7 @@ int main(int ac, char **av)
 		return (0);
 
 	/* Initialize libp7 and communication */
-	p7_handle_t *handle; int err;
+	p7_handle_t *handle = NULL; int err;
 	if (args.com) err = p7_cominit(&handle, 1, !args.noinit, args.com);
 	else err = p7_init(&handle, 1, !args.noinit);
 	if (err) {
diff --git a/src/p7os/main.c b/src/p7os/main.c
index dcf9ee8..640c517 100644
--- a/src/p7os/main.c
+++ b/src/p7os/main.c
@@ -57,7 +57,7 @@ int main(int ac, char **av)
 		return (0);
 
 	/* Initialize libp7 and communication */
-	p7_handle_t *handle; int err;
+	p7_handle_t *handle = NULL; int err;
 	if (args.com) err = p7_cominit(&handle, 1, 1, args.com);
 	else err = p7_init(&handle, 1, 1);
 	if (err) goto init_error;
diff --git a/src/p7screen/main.c b/src/p7screen/main.c
index cacc063..ef0b41d 100644
--- a/src/p7screen/main.c
+++ b/src/p7screen/main.c
@@ -127,7 +127,7 @@ int main(int ac, char **av)
 		return (0);
 
 	/* Initialize libp7 */
-	p7_handle_t *handle; int err;
+	p7_handle_t *handle = NULL; int err;
 	if (com) err = p7_cominit(&handle, 0, 0, com);
 	else err = p7_init(&handle, 0, 0);
 	if (err) {