Minor fixes

Fixed a NullPointerException in ConfigHandler.