diff --git a/dmlc-core b/dmlc-core
index d2003b69edc6..cf0bfe73b535 160000
--- a/dmlc-core
+++ b/dmlc-core
@@ -1 +1 @@
-Subproject commit d2003b69edc653698d01f3c33986d241b822b3be
+Subproject commit cf0bfe73b535dcd9bff4221b737148f06eb6f4c3
diff --git a/mshadow b/mshadow
index 32eda9a021fb..a38bb6929f63 160000
--- a/mshadow
+++ b/mshadow
@@ -1 +1 @@
-Subproject commit 32eda9a021fb613b72fef89a311fe2054b554630
+Subproject commit a38bb6929f63671e4ae0919dbbfc8642f43197f2
diff --git a/src/engine/engine.cc b/src/engine/engine.cc
index 70bd18c442b7..aeef21cbcab9 100644
--- a/src/engine/engine.cc
+++ b/src/engine/engine.cc
@@ -25,8 +25,9 @@ inline Engine* CreateEngine() {
     ret = CreateThreadedEnginePerDevice();
   }
 
-  CHECK_NE(ret, nullptr)
-      << "Cannot find Engine " << type;
+  if (ret ==nullptr) {
+    LOG(FATAL) << "Cannot find Engine " << type;
+  }
   if (!default_engine) {
     LOG(INFO) << "MXNet start using engine: " << type;
   }
diff --git a/src/engine/threaded_engine_pooled.cc b/src/engine/threaded_engine_pooled.cc
index 8b8055a6b33f..49b120869b73 100644
--- a/src/engine/threaded_engine_pooled.cc
+++ b/src/engine/threaded_engine_pooled.cc
@@ -7,6 +7,7 @@
 #include <dmlc/base.h>
 #include <dmlc/logging.h>
 #include <dmlc/concurrency.h>
+#include <cassert>
 #include "./threaded_engine.h"
 #include "./thread_pool.h"
 #include "./stream_manager.h"
diff --git a/src/operator/operator.cc b/src/operator/operator.cc
index b189a3f22a89..e476c583e668 100644
--- a/src/operator/operator.cc
+++ b/src/operator/operator.cc
@@ -15,8 +15,9 @@ namespace mxnet {
 // implementation of all factory functions
 OperatorProperty *OperatorProperty::Create(const char* type_name) {
   auto *creator = dmlc::Registry<OperatorPropertyReg>::Find(type_name);
-  CHECK_NE(creator, nullptr)
-      << "Cannot find Operator " << type_name << " in registry";
+  if (creator == nullptr) {
+    LOG(FATAL) << "Cannot find Operator " << type_name << " in registry";
+  }
   return creator->body();
 }
 }  // namespace mxnet
diff --git a/src/symbol/graph_executor.cc b/src/symbol/graph_executor.cc
index 6983beab1e90..a6aa184cbf30 100644
--- a/src/symbol/graph_executor.cc
+++ b/src/symbol/graph_executor.cc
@@ -167,8 +167,9 @@ inline std::vector<std::pair<T, T> > GraphExecutor::GetInplaceOption(
         out_grad_index, in_data_index, out_data_index, in_grad_ptr);
     std::vector<std::pair<T, T> > remap(remap_index.size());
     for (size_t i = 0; i < remap_index.size(); ++i) {
-      CHECK_NE(args_array[remap_index[i].first], nullptr)
-          << "BackwardInplaceOption uses input that is returned by DeclareBackwardDependency";
+      if (args_array[remap_index[i].first] == nullptr) {
+        LOG(FATAL) << "BackwardInplaceOption uses input that is returned by DeclareBackwardDependency";
+      }
       remap[i].first = *args_array[remap_index[i].first];
       remap[i].second = *static_cast<T*>(remap_index[i].second);
     }