fix for null config content and cleanup