diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/ds/ApolloDataSourceProvider.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/ds/ApolloDataSourceProvider.java
index c23e936282031d2ba9b9e5a1d44147861c46acec..5222674219ca86207f7a3b897afa34434ba16cc2 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/ds/ApolloDataSourceProvider.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/ds/ApolloDataSourceProvider.java
@@ -46,7 +46,7 @@ public class ApolloDataSourceProvider implements DataSourceProvider, LogEnabled
          String appId = Foundation.app().getAppId();
          String envType = Foundation.server().getEnvType();
 
-         if (file.hasContent()) {
+         if (file != null && file.hasContent()) {
             String content = file.getContent();
 
             m_logger.info(String.format("Found datasources.xml from Apollo(env=%s, app.id=%s)!", envType, appId));
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java
index e062cf149649ea98e435ffcbf67917e264ffe2d7..056ec77b3d0b90f3458880f3b5bc1f7aeecc5e6b 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java
@@ -12,7 +12,7 @@ public abstract class PlainTextConfigFile extends AbstractConfigFile {
 
   @Override
   public String getContent() {
-    if (m_configProperties.get() == null) {
+    if (!this.hasContent()) {
       return null;
     }
     return m_configProperties.get().getProperty(ConfigConsts.CONFIG_FILE_CONTENT_KEY);
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java
index d3fcc20070b543dccd5bd8a87ad9a6f16ee0e24c..7c1052da6f3c685078096c8e55cad83ba03ed44a 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java
@@ -34,7 +34,7 @@ public class PropertiesConfigFile extends AbstractConfigFile {
   }
 
   String doGetContent() {
-    if (m_configProperties.get() == null) {
+    if (!this.hasContent()) {
       return null;
     }