diff --git a/include/sqlpp11/bad_statement.h b/include/sqlpp11/bad_statement.h
deleted file mode 100644
index c8b78a5c..00000000
--- a/include/sqlpp11/bad_statement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2013-2015, Roland Bock
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice, this
- *   list of conditions and the following disclaimer in the documentation and/or
- *   other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SQLPP_BAD_STATEMENT_H
-#define SQLPP_BAD_STATEMENT_H
-
-namespace sqlpp
-{
-  struct bad_statement
-  {
-    static constexpr bool value = false;
-
-    template <typename... T>
-    bad_statement(T&&...)
-    {
-    }
-  };
-}
-
-#endif
diff --git a/include/sqlpp11/result_field_base.h b/include/sqlpp11/result_field_base.h
index 01f66758..3f6d3992 100644
--- a/include/sqlpp11/result_field_base.h
+++ b/include/sqlpp11/result_field_base.h
@@ -28,7 +28,6 @@
 #define SQLPP_RESULT_FIELD_BASE_H
 
 #include <sqlpp11/alias_operators.h>
-#include <sqlpp11/bad_statement.h>
 #include <sqlpp11/basic_expression_operators.h>
 #include <sqlpp11/exception.h>
 #include <sqlpp11/result_field.h>
@@ -37,6 +36,8 @@
 
 namespace sqlpp
 {
+  SQLPP_PORTABLE_STATIC_ASSERT(assert_result_field_value_is_safe_t, "result field value needs to be checked for NULL");
+
   template <typename Db, typename FieldSpec, typename StorageType = typename value_type_of<FieldSpec>::_cpp_value_type>
   struct result_field_base
   {
@@ -117,8 +118,9 @@ namespace sqlpp
       return _value;
     }
 
-    operator typename std::conditional<_null_is_trivial or (not _can_be_null::value), _cpp_value_type, bad_statement>::
-        type() const
+    operator typename std::conditional<_null_is_trivial or (not _can_be_null::value),
+                                       _cpp_value_type,
+                                       assert_result_field_value_is_safe_t>::type() const
     {
       return value();
     }