diff --git a/bcc_code_emitter.cpp b/bcc_code_emitter.cpp
index 69bb94b..85cfafd 100644
--- a/bcc_code_emitter.cpp
+++ b/bcc_code_emitter.cpp
@@ -1169,9 +1169,10 @@
 }
 
 
-#if defined(USE_DISASSEMBLER)
 void CodeEmitter::Disassemble(const llvm::StringRef &Name,
                               uint8_t *Start, size_t Length, bool IsStub) {
+
+#if defined(USE_DISASSEMBLER)
   llvm::raw_ostream *OS;
 
 #if defined(USE_DISASSEMBLER_FILE)
@@ -1179,6 +1180,7 @@
   OS = new llvm::raw_fd_ostream("/data/local/tmp/out.S",
                                 ErrorInfo,
                                 llvm::raw_fd_ostream::F_Append);
+
   if (!ErrorInfo.empty()) {    // some errors occurred
     // LOGE("Error in creating disassembly file");
     delete OS;
@@ -1230,9 +1232,8 @@
   delete OS;
 #endif
 
-  return;
+#endif // defined(USE_DISASSEMBLER)
 }
-#endif  // defined(USE_DISASSEMBLER)
 
 
 void CodeEmitter::setTargetMachine(llvm::TargetMachine &TM) {
diff --git a/bcc_code_emitter.h b/bcc_code_emitter.h
index 9a3dff2..ce90126 100644
--- a/bcc_code_emitter.h
+++ b/bcc_code_emitter.h
@@ -219,15 +219,11 @@
     const llvm::MCAsmInfo *mpAsmInfo;
     const llvm::MCDisassembler *mpDisassmbler;
     llvm::MCInstPrinter *mpIP;
+#endif
 
   public:
     void Disassemble(const llvm::StringRef &Name, uint8_t *Start,
                      size_t Length, bool IsStub);
-#else
-    void Disassemble(const llvm::StringRef &Name, uint8_t *Start,
-                     size_t Length, bool IsStub) {
-    }
-#endif  // defined(USE_DISASSEMBLER)
 
   private:
     // Resolver to undefined symbol in CodeEmitter