Added checking for null configuration properties, since they generated multiple null exceptions.