diff -ru a/include/lib_acpi.h b/include/lib_acpi.h
--- a/include/lib_acpi.h	2005-07-21 21:33:19.000000000 -0400
+++ b/include/lib_acpi.h	2011-06-20 19:53:30.458953984 -0400
@@ -32,7 +32,7 @@
  * Macros
  ************************************************************************/
 
-#  define ACPIDEV "/proc/acpi/info"
+#  define ACPIDEV "/proc/acpi/battery"
 
   /* use ? */
 #  ifndef ACPI_32_BIT_SUPPORT
diff -ru a/src/dockapp.c b/src/dockapp.c
--- a/src/dockapp.c	2005-08-16 18:38:36.000000000 -0400
+++ b/src/dockapp.c	2011-06-20 19:44:20.022684448 -0400
@@ -431,5 +431,6 @@
 void
 dockapp_cleanup(void)
 {
+  if (display != NULL)
     XCloseDisplay(display);
 }