Added checks for null pointers and renamed a few configuration file options