diff --git a/GI/Soup.hs b/GI/Soup.hs
--- a/GI/Soup.hs
+++ b/GI/Soup.hs
@@ -93,6 +93,7 @@
 addressNew name port = liftIO $ do
     name' <- textToCString name
     result <- soup_address_new name' port
+    checkUnexpectedReturnNULL "soup_address_new" result
     result' <- (wrapObject Address) result
     freeMem name'
     return result'
@@ -120,6 +121,7 @@
 addressNewAny family port = liftIO $ do
     let family' = (fromIntegral . fromEnum) family
     result <- soup_address_new_any family' port
+    checkUnexpectedReturnNULL "soup_address_new_any" result
     result' <- (wrapObject Address) result
     return result'
 
@@ -145,6 +147,7 @@
     m Address
 addressNewFromSockaddr sa len = liftIO $ do
     result <- soup_address_new_from_sockaddr sa len
+    checkUnexpectedReturnNULL "soup_address_new_from_sockaddr" result
     result' <- (wrapObject Address) result
     return result'
 
@@ -227,6 +230,7 @@
 addressGetGsockaddr _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_address_get_gsockaddr _obj'
+    checkUnexpectedReturnNULL "soup_address_get_gsockaddr" result
     result' <- (wrapObject Gio.SocketAddress) result
     touchManagedPtr _obj
     return result'
@@ -252,6 +256,7 @@
 addressGetName _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_address_get_name _obj'
+    checkUnexpectedReturnNULL "soup_address_get_name" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -277,6 +282,7 @@
 addressGetPhysical _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_address_get_physical _obj'
+    checkUnexpectedReturnNULL "soup_address_get_physical" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -415,7 +421,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr AddressCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr AddressCallbackC))
     callback' <- mkAddressCallback (addressCallbackWrapper (Just ptrcallback) callback)
     poke ptrcallback callback'
     let user_data = nullPtr
@@ -565,6 +571,7 @@
     let msg' = unsafeManagedPtrCastPtr msg
     auth_header' <- textToCString auth_header
     result <- soup_auth_new type_' msg' auth_header'
+    checkUnexpectedReturnNULL "soup_auth_new" result
     result' <- (wrapObject Auth) result
     touchManagedPtr msg
     freeMem auth_header'
@@ -626,6 +633,7 @@
     let _obj' = unsafeManagedPtrCastPtr _obj
     let msg' = unsafeManagedPtrCastPtr msg
     result <- soup_auth_get_authorization _obj' msg'
+    checkUnexpectedReturnNULL "soup_auth_get_authorization" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr _obj
@@ -653,6 +661,7 @@
 authGetHost _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_auth_get_host _obj'
+    checkUnexpectedReturnNULL "soup_auth_get_host" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -678,6 +687,7 @@
 authGetInfo _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_auth_get_info _obj'
+    checkUnexpectedReturnNULL "soup_auth_get_info" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr _obj
@@ -707,6 +717,7 @@
     let _obj' = unsafeManagedPtrCastPtr _obj
     let source_uri' = unsafeManagedPtrGetPtr source_uri
     result <- soup_auth_get_protection_space _obj' source_uri'
+    checkUnexpectedReturnNULL "soup_auth_get_protection_space" result
     result' <- unpackGSList result
     result'' <- mapM cstringToText result'
     mapGSList freeMem result
@@ -736,6 +747,7 @@
 authGetRealm _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_auth_get_realm _obj'
+    checkUnexpectedReturnNULL "soup_auth_get_realm" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -764,6 +776,7 @@
     let _obj' = unsafeManagedPtrCastPtr _obj
     user' <- textToCString user
     result <- soup_auth_get_saved_password _obj' user'
+    checkUnexpectedReturnNULL "soup_auth_get_saved_password" result
     result' <- cstringToText result
     touchManagedPtr _obj
     freeMem user'
@@ -790,6 +803,7 @@
 authGetSavedUsers _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_auth_get_saved_users _obj'
+    checkUnexpectedReturnNULL "soup_auth_get_saved_users" result
     result' <- unpackGSList result
     result'' <- mapM cstringToText result'
     mapGSList freeMem result
@@ -818,6 +832,7 @@
 authGetSchemeName _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_auth_get_scheme_name _obj'
+    checkUnexpectedReturnNULL "soup_auth_get_scheme_name" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -1085,6 +1100,7 @@
     let _obj' = unsafeManagedPtrCastPtr _obj
     let msg' = unsafeManagedPtrCastPtr msg
     result <- soup_auth_domain_accepts _obj' msg'
+    checkUnexpectedReturnNULL "soup_auth_domain_accepts" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr _obj
@@ -1296,6 +1312,7 @@
 authDomainGetRealm _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_auth_domain_get_realm _obj'
+    checkUnexpectedReturnNULL "soup_auth_domain_get_realm" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -1537,6 +1554,7 @@
     realm' <- textToCString realm
     password' <- textToCString password
     result <- soup_auth_domain_digest_encode_password username' realm' password'
+    checkUnexpectedReturnNULL "soup_auth_domain_digest_encode_password" result
     result' <- cstringToText result
     freeMem result
     freeMem username'
@@ -1831,6 +1849,7 @@
     let length_ = fromIntegral $ B.length data_
     data_' <- packByteString data_
     result <- soup_buffer_new_take data_' length_
+    checkUnexpectedReturnNULL "soup_buffer_new_take" result
     result' <- (wrapBoxed Buffer) result
     return result'
 
@@ -1860,7 +1879,7 @@
 bufferNewWithOwner data_ owner owner_dnotify = liftIO $ do
     let length_ = fromIntegral $ B.length data_
     data_' <- packByteString data_
-    ptrowner_dnotify <- callocBytes $ sizeOf (undefined :: FunPtr GLib.DestroyNotifyC)
+    ptrowner_dnotify <- callocMem :: IO (Ptr (FunPtr GLib.DestroyNotifyC))
     maybeOwner_dnotify <- case owner_dnotify of
         Nothing -> return (castPtrToFunPtr nullPtr)
         Just jOwner_dnotify -> do
@@ -1868,6 +1887,7 @@
             poke ptrowner_dnotify jOwner_dnotify'
             return jOwner_dnotify'
     result <- soup_buffer_new_with_owner data_' length_ owner maybeOwner_dnotify
+    checkUnexpectedReturnNULL "soup_buffer_new_with_owner" result
     result' <- (wrapBoxed Buffer) result
     freeMem data_'
     return result'
@@ -1893,6 +1913,7 @@
 bufferCopy _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_buffer_copy _obj'
+    checkUnexpectedReturnNULL "soup_buffer_copy" result
     result' <- (wrapBoxed Buffer) result
     touchManagedPtr _obj
     return result'
@@ -1942,6 +1963,7 @@
 bufferGetAsBytes _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_buffer_get_as_bytes _obj'
+    checkUnexpectedReturnNULL "soup_buffer_get_as_bytes" result
     result' <- (wrapBoxed GLib.Bytes) result
     touchManagedPtr _obj
     return result'
@@ -2028,6 +2050,7 @@
 bufferNewSubbuffer _obj offset length_ = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_buffer_new_subbuffer _obj' offset length_
+    checkUnexpectedReturnNULL "soup_buffer_new_subbuffer" result
     result' <- (wrapBoxed Buffer) result
     touchManagedPtr _obj
     return result'
@@ -2077,6 +2100,7 @@
     cache_dir' <- textToCString cache_dir
     let cache_type' = (fromIntegral . fromEnum) cache_type
     result <- soup_cache_new cache_dir' cache_type'
+    checkUnexpectedReturnNULL "soup_cache_new" result
     result' <- (wrapObject Cache) result
     freeMem cache_dir'
     return result'
@@ -2375,6 +2399,7 @@
 clientContextGetAddress _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_get_address _obj'
+    checkUnexpectedReturnNULL "soup_client_context_get_address" result
     result' <- (newObject Address) result
     touchManagedPtr _obj
     return result'
@@ -2400,6 +2425,7 @@
 clientContextGetAuthDomain _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_get_auth_domain _obj'
+    checkUnexpectedReturnNULL "soup_client_context_get_auth_domain" result
     result' <- (newObject AuthDomain) result
     touchManagedPtr _obj
     return result'
@@ -2425,6 +2451,7 @@
 clientContextGetAuthUser _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_get_auth_user _obj'
+    checkUnexpectedReturnNULL "soup_client_context_get_auth_user" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -2450,6 +2477,7 @@
 clientContextGetGsocket _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_get_gsocket _obj'
+    checkUnexpectedReturnNULL "soup_client_context_get_gsocket" result
     result' <- (newObject Gio.Socket) result
     touchManagedPtr _obj
     return result'
@@ -2475,6 +2503,7 @@
 clientContextGetHost _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_get_host _obj'
+    checkUnexpectedReturnNULL "soup_client_context_get_host" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -2500,6 +2529,7 @@
 clientContextGetLocalAddress _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_get_local_address _obj'
+    checkUnexpectedReturnNULL "soup_client_context_get_local_address" result
     result' <- (newObject Gio.SocketAddress) result
     touchManagedPtr _obj
     return result'
@@ -2525,6 +2555,7 @@
 clientContextGetRemoteAddress _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_get_remote_address _obj'
+    checkUnexpectedReturnNULL "soup_client_context_get_remote_address" result
     result' <- (newObject Gio.SocketAddress) result
     touchManagedPtr _obj
     return result'
@@ -2550,6 +2581,7 @@
 clientContextGetSocket _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_get_socket _obj'
+    checkUnexpectedReturnNULL "soup_client_context_get_socket" result
     result' <- (newObject Socket) result
     touchManagedPtr _obj
     return result'
@@ -2575,6 +2607,7 @@
 clientContextStealConnection _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_client_context_steal_connection _obj'
+    checkUnexpectedReturnNULL "soup_client_context_steal_connection" result
     result' <- (wrapObject Gio.IOStream) result
     touchManagedPtr _obj
     return result'
@@ -2679,6 +2712,7 @@
     m ContentSniffer
 contentSnifferNew  = liftIO $ do
     result <- soup_content_sniffer_new
+    checkUnexpectedReturnNULL "soup_content_sniffer_new" result
     result' <- (wrapObject ContentSniffer) result
     return result'
 
@@ -2735,6 +2769,7 @@
     let buffer' = unsafeManagedPtrGetPtr buffer
     params <- allocMem :: IO (Ptr (Ptr (GHashTable CString CString)))
     result <- soup_content_sniffer_sniff _obj' msg' buffer' params
+    checkUnexpectedReturnNULL "soup_content_sniffer_sniff" result
     result' <- cstringToText result
     freeMem result
     params' <- peek params
@@ -2836,6 +2871,7 @@
     domain' <- textToCString domain
     path' <- textToCString path
     result <- soup_cookie_new name' value' domain' path' max_age
+    checkUnexpectedReturnNULL "soup_cookie_new" result
     result' <- (wrapBoxed Cookie) result
     freeMem name'
     freeMem value'
@@ -2893,6 +2929,7 @@
 cookieCopy _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_cookie_copy _obj'
+    checkUnexpectedReturnNULL "soup_cookie_copy" result
     result' <- (wrapBoxed Cookie) result
     touchManagedPtr _obj
     return result'
@@ -3000,6 +3037,7 @@
 cookieGetDomain _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_cookie_get_domain _obj'
+    checkUnexpectedReturnNULL "soup_cookie_get_domain" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -3025,6 +3063,7 @@
 cookieGetExpires _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_cookie_get_expires _obj'
+    checkUnexpectedReturnNULL "soup_cookie_get_expires" result
     result' <- (newBoxed Date) result
     touchManagedPtr _obj
     return result'
@@ -3075,6 +3114,7 @@
 cookieGetName _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_cookie_get_name _obj'
+    checkUnexpectedReturnNULL "soup_cookie_get_name" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -3100,6 +3140,7 @@
 cookieGetPath _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_cookie_get_path _obj'
+    checkUnexpectedReturnNULL "soup_cookie_get_path" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -3150,6 +3191,7 @@
 cookieGetValue _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_cookie_get_value _obj'
+    checkUnexpectedReturnNULL "soup_cookie_get_value" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -3395,6 +3437,7 @@
 cookieToCookieHeader _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_cookie_to_cookie_header _obj'
+    checkUnexpectedReturnNULL "soup_cookie_to_cookie_header" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr _obj
@@ -3421,6 +3464,7 @@
 cookieToSetCookieHeader _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_cookie_to_set_cookie_header _obj'
+    checkUnexpectedReturnNULL "soup_cookie_to_set_cookie_header" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr _obj
@@ -3465,6 +3509,7 @@
     m CookieJar
 cookieJarNew  = liftIO $ do
     result <- soup_cookie_jar_new
+    checkUnexpectedReturnNULL "soup_cookie_jar_new" result
     result' <- (wrapObject CookieJar) result
     return result'
 
@@ -3549,6 +3594,7 @@
 cookieJarAllCookies _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_cookie_jar_all_cookies _obj'
+    checkUnexpectedReturnNULL "soup_cookie_jar_all_cookies" result
     result' <- unpackGSList result
     result'' <- mapM (wrapBoxed Cookie) result'
     g_slist_free result
@@ -3635,6 +3681,7 @@
     let uri' = unsafeManagedPtrGetPtr uri
     let for_http' = (fromIntegral . fromEnum) for_http
     result <- soup_cookie_jar_get_cookie_list _obj' uri' for_http'
+    checkUnexpectedReturnNULL "soup_cookie_jar_get_cookie_list" result
     result' <- unpackGSList result
     result'' <- mapM (wrapBoxed Cookie) result'
     g_slist_free result
@@ -3669,6 +3716,7 @@
     let uri' = unsafeManagedPtrGetPtr uri
     let for_http' = (fromIntegral . fromEnum) for_http
     result <- soup_cookie_jar_get_cookies _obj' uri' for_http'
+    checkUnexpectedReturnNULL "soup_cookie_jar_get_cookies" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr _obj
@@ -3936,6 +3984,7 @@
     filename' <- textToCString filename
     let read_only' = (fromIntegral . fromEnum) read_only
     result <- soup_cookie_jar_db_new filename' read_only'
+    checkUnexpectedReturnNULL "soup_cookie_jar_db_new" result
     result' <- (wrapObject CookieJarDB) result
     freeMem filename'
     return result'
@@ -3985,6 +4034,7 @@
     filename' <- textToCString filename
     let read_only' = (fromIntegral . fromEnum) read_only
     result <- soup_cookie_jar_text_new filename' read_only'
+    checkUnexpectedReturnNULL "soup_cookie_jar_text_new" result
     result' <- (wrapObject CookieJarText) result
     freeMem filename'
     return result'
@@ -4071,6 +4121,7 @@
     m Date
 dateNew year month day hour minute second = liftIO $ do
     result <- soup_date_new year month day hour minute second
+    checkUnexpectedReturnNULL "soup_date_new" result
     result' <- (wrapBoxed Date) result
     return result'
 
@@ -4094,6 +4145,7 @@
     m Date
 dateNewFromNow offset_seconds = liftIO $ do
     result <- soup_date_new_from_now offset_seconds
+    checkUnexpectedReturnNULL "soup_date_new_from_now" result
     result' <- (wrapBoxed Date) result
     return result'
 
@@ -4118,6 +4170,7 @@
 dateNewFromString date_string = liftIO $ do
     date_string' <- textToCString date_string
     result <- soup_date_new_from_string date_string'
+    checkUnexpectedReturnNULL "soup_date_new_from_string" result
     result' <- (wrapBoxed Date) result
     freeMem date_string'
     return result'
@@ -4142,6 +4195,7 @@
     m Date
 dateNewFromTimeT when_ = liftIO $ do
     result <- soup_date_new_from_time_t when_
+    checkUnexpectedReturnNULL "soup_date_new_from_time_t" result
     result' <- (wrapBoxed Date) result
     return result'
 
@@ -4166,6 +4220,7 @@
 dateCopy _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_date_copy _obj'
+    checkUnexpectedReturnNULL "soup_date_copy" result
     result' <- (wrapBoxed Date) result
     touchManagedPtr _obj
     return result'
@@ -4435,6 +4490,7 @@
     let _obj' = unsafeManagedPtrGetPtr _obj
     let format' = (fromIntegral . fromEnum) format
     result <- soup_date_to_string _obj' format'
+    checkUnexpectedReturnNULL "soup_date_to_string" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr _obj
@@ -4858,6 +4914,7 @@
 loggerNew level max_body_size = liftIO $ do
     let level' = (fromIntegral . fromEnum) level
     result <- soup_logger_new level' max_body_size
+    checkUnexpectedReturnNULL "soup_logger_new" result
     result' <- (wrapObject Logger) result
     return result'
 
@@ -5192,6 +5249,7 @@
     method' <- textToCString method
     uri_string' <- textToCString uri_string
     result <- soup_message_new method' uri_string'
+    checkUnexpectedReturnNULL "soup_message_new" result
     result' <- (wrapObject Message) result
     freeMem method'
     freeMem uri_string'
@@ -5221,6 +5279,7 @@
     method' <- textToCString method
     let uri' = unsafeManagedPtrGetPtr uri
     result <- soup_message_new_from_uri method' uri'
+    checkUnexpectedReturnNULL "soup_message_new_from_uri" result
     result' <- (wrapObject Message) result
     touchManagedPtr uri
     freeMem method'
@@ -5333,6 +5392,7 @@
 messageGetAddress _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_message_get_address _obj'
+    checkUnexpectedReturnNULL "soup_message_get_address" result
     result' <- (newObject Address) result
     touchManagedPtr _obj
     return result'
@@ -5358,6 +5418,7 @@
 messageGetFirstParty _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_message_get_first_party _obj'
+    checkUnexpectedReturnNULL "soup_message_get_first_party" result
     result' <- (newBoxed URI) result
     touchManagedPtr _obj
     return result'
@@ -5493,6 +5554,7 @@
 messageGetSoupRequest _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_message_get_soup_request _obj'
+    checkUnexpectedReturnNULL "soup_message_get_soup_request" result
     result' <- (newObject Request) result
     touchManagedPtr _obj
     return result'
@@ -5518,6 +5580,7 @@
 messageGetUri _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_message_get_uri _obj'
+    checkUnexpectedReturnNULL "soup_message_get_uri" result
     result' <- (newBoxed URI) result
     touchManagedPtr _obj
     return result'
@@ -6768,6 +6831,7 @@
     m MessageBody
 messageBodyNew  = liftIO $ do
     result <- soup_message_body_new
+    checkUnexpectedReturnNULL "soup_message_body_new" result
     result' <- (wrapBoxed MessageBody) result
     return result'
 
@@ -6873,6 +6937,7 @@
 messageBodyFlatten _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_message_body_flatten _obj'
+    checkUnexpectedReturnNULL "soup_message_body_flatten" result
     result' <- (wrapBoxed Buffer) result
     touchManagedPtr _obj
     return result'
@@ -6949,6 +7014,7 @@
 messageBodyGetChunk _obj offset = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_message_body_get_chunk _obj' offset
+    checkUnexpectedReturnNULL "soup_message_body_get_chunk" result
     result' <- (wrapBoxed Buffer) result
     touchManagedPtr _obj
     return result'
@@ -7135,6 +7201,7 @@
 messageHeadersNew type_ = liftIO $ do
     let type_' = (fromIntegral . fromEnum) type_
     result <- soup_message_headers_new type_'
+    checkUnexpectedReturnNULL "soup_message_headers_new" result
     result' <- (wrapBoxed MessageHeaders) result
     return result'
 
@@ -7324,6 +7391,7 @@
     let _obj' = unsafeManagedPtrGetPtr _obj
     name' <- textToCString name
     result <- soup_message_headers_get _obj' name'
+    checkUnexpectedReturnNULL "soup_message_headers_get" result
     result' <- cstringToText result
     touchManagedPtr _obj
     freeMem name'
@@ -7449,6 +7517,7 @@
     let _obj' = unsafeManagedPtrGetPtr _obj
     params <- allocMem :: IO (Ptr (Ptr (GHashTable CString CString)))
     result <- soup_message_headers_get_content_type _obj' params
+    checkUnexpectedReturnNULL "soup_message_headers_get_content_type" result
     result' <- cstringToText result
     params' <- peek params
     params'' <- unpackGHashTable params'
@@ -7561,6 +7630,7 @@
     let _obj' = unsafeManagedPtrGetPtr _obj
     name' <- textToCString name
     result <- soup_message_headers_get_list _obj' name'
+    checkUnexpectedReturnNULL "soup_message_headers_get_list" result
     result' <- cstringToText result
     touchManagedPtr _obj
     freeMem name'
@@ -7590,6 +7660,7 @@
     let _obj' = unsafeManagedPtrGetPtr _obj
     name' <- textToCString name
     result <- soup_message_headers_get_one _obj' name'
+    checkUnexpectedReturnNULL "soup_message_headers_get_one" result
     result' <- cstringToText result
     touchManagedPtr _obj
     freeMem name'
@@ -8184,6 +8255,7 @@
 multipartNew mime_type = liftIO $ do
     mime_type' <- textToCString mime_type
     result <- soup_multipart_new mime_type'
+    checkUnexpectedReturnNULL "soup_multipart_new" result
     result' <- (wrapBoxed Multipart) result
     freeMem mime_type'
     return result'
@@ -8212,6 +8284,7 @@
     let headers' = unsafeManagedPtrGetPtr headers
     let body' = unsafeManagedPtrGetPtr body
     result <- soup_multipart_new_from_message headers' body'
+    checkUnexpectedReturnNULL "soup_multipart_new_from_message" result
     result' <- (wrapBoxed Multipart) result
     touchManagedPtr headers
     touchManagedPtr body
@@ -8481,6 +8554,7 @@
     let msg' = unsafeManagedPtrCastPtr msg
     let base_stream' = unsafeManagedPtrCastPtr base_stream
     result <- soup_multipart_input_stream_new msg' base_stream'
+    checkUnexpectedReturnNULL "soup_multipart_input_stream_new" result
     result' <- (wrapObject MultipartInputStream) result
     touchManagedPtr msg
     touchManagedPtr base_stream
@@ -8507,6 +8581,7 @@
 multipartInputStreamGetHeaders _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_multipart_input_stream_get_headers _obj'
+    checkUnexpectedReturnNULL "soup_multipart_input_stream_get_headers" result
     result' <- (newBoxed MessageHeaders) result
     touchManagedPtr _obj
     return result'
@@ -8541,6 +8616,7 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ soup_multipart_input_stream_next_part _obj' maybeCancellable
+        checkUnexpectedReturnNULL "soup_multipart_input_stream_next_part" result
         result' <- (wrapObject Gio.InputStream) result
         touchManagedPtr _obj
         whenJust cancellable touchManagedPtr
@@ -8581,7 +8657,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr Gio.AsyncReadyCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr Gio.AsyncReadyCallbackC))
     maybeCallback <- case callback of
         Nothing -> return (castPtrToFunPtr nullPtr)
         Just jCallback -> do
@@ -8620,6 +8696,7 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ soup_multipart_input_stream_next_part_finish _obj' result_'
+        checkUnexpectedReturnNULL "soup_multipart_input_stream_next_part_finish" result
         result' <- (wrapObject Gio.InputStream) result
         touchManagedPtr _obj
         touchManagedPtr result_
@@ -8692,7 +8769,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr PasswordManagerCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr PasswordManagerCallbackC))
     callback' <- mkPasswordManagerCallback (passwordManagerCallbackWrapper (Just ptrcallback) callback)
     poke ptrcallback callback'
     let user_data = nullPtr
@@ -8870,7 +8947,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr ProxyURIResolverCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr ProxyURIResolverCallbackC))
     callback' <- mkProxyURIResolverCallback (proxyURIResolverCallbackWrapper (Just ptrcallback) callback)
     poke ptrcallback callback'
     let user_data = nullPtr
@@ -9039,6 +9116,7 @@
 requestGetContentType _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_request_get_content_type _obj'
+    checkUnexpectedReturnNULL "soup_request_get_content_type" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -9064,6 +9142,7 @@
 requestGetSession _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_request_get_session _obj'
+    checkUnexpectedReturnNULL "soup_request_get_session" result
     result' <- (newObject Session) result
     touchManagedPtr _obj
     return result'
@@ -9089,6 +9168,7 @@
 requestGetUri _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_request_get_uri _obj'
+    checkUnexpectedReturnNULL "soup_request_get_uri" result
     result' <- (newBoxed URI) result
     touchManagedPtr _obj
     return result'
@@ -9123,6 +9203,7 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ soup_request_send _obj' maybeCancellable
+        checkUnexpectedReturnNULL "soup_request_send" result
         result' <- (wrapObject Gio.InputStream) result
         touchManagedPtr _obj
         whenJust cancellable touchManagedPtr
@@ -9161,7 +9242,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr Gio.AsyncReadyCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr Gio.AsyncReadyCallbackC))
     maybeCallback <- case callback of
         Nothing -> return (castPtrToFunPtr nullPtr)
         Just jCallback -> do
@@ -9200,6 +9281,7 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ soup_request_send_finish _obj' result_'
+        checkUnexpectedReturnNULL "soup_request_send_finish" result
         result' <- (wrapObject Gio.InputStream) result
         touchManagedPtr _obj
         touchManagedPtr result_
@@ -9315,6 +9397,7 @@
 requestFileGetFile _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_request_file_get_file _obj'
+    checkUnexpectedReturnNULL "soup_request_file_get_file" result
     result' <- (wrapObject Gio.File) result
     touchManagedPtr _obj
     return result'
@@ -9361,6 +9444,7 @@
 requestHTTPGetMessage _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_request_http_get_message _obj'
+    checkUnexpectedReturnNULL "soup_request_http_get_message" result
     result' <- (wrapObject Message) result
     touchManagedPtr _obj
     return result'
@@ -9404,6 +9488,7 @@
     m Requester
 requesterNew  = liftIO $ do
     result <- soup_requester_new
+    checkUnexpectedReturnNULL "soup_requester_new" result
     result' <- (wrapObject Requester) result
     return result'
 
@@ -9433,6 +9518,7 @@
     uri_string' <- textToCString uri_string
     onException (do
         result <- propagateGError $ soup_requester_request _obj' uri_string'
+        checkUnexpectedReturnNULL "soup_requester_request" result
         result' <- (wrapObject Request) result
         touchManagedPtr _obj
         freeMem uri_string'
@@ -9467,6 +9553,7 @@
     let uri' = unsafeManagedPtrGetPtr uri
     onException (do
         result <- propagateGError $ soup_requester_request_uri _obj' uri'
+        checkUnexpectedReturnNULL "soup_requester_request_uri" result
         result' <- (wrapObject Request) result
         touchManagedPtr _obj
         touchManagedPtr uri
@@ -9790,6 +9877,7 @@
 serverGetAsyncContext _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_server_get_async_context _obj'
+    checkUnexpectedReturnNULL "soup_server_get_async_context" result
     result' <- (newBoxed GLib.MainContext) result
     touchManagedPtr _obj
     return result'
@@ -9815,6 +9903,7 @@
 serverGetListener _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_server_get_listener _obj'
+    checkUnexpectedReturnNULL "soup_server_get_listener" result
     result' <- (newObject Socket) result
     touchManagedPtr _obj
     return result'
@@ -9840,6 +9929,7 @@
 serverGetListeners _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_server_get_listeners _obj'
+    checkUnexpectedReturnNULL "soup_server_get_listeners" result
     result' <- unpackGSList result
     result'' <- mapM (newObject Gio.Socket) result'
     g_slist_free result
@@ -9891,6 +9981,7 @@
 serverGetUris _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_server_get_uris _obj'
+    checkUnexpectedReturnNULL "soup_server_get_uris" result
     result' <- unpackGSList result
     result'' <- mapM (wrapBoxed URI) result'
     g_slist_free result
@@ -10669,6 +10760,7 @@
     m Session
 sessionNew  = liftIO $ do
     result <- soup_session_new
+    checkUnexpectedReturnNULL "soup_session_new" result
     result' <- (wrapObject Session) result
     return result'
 
@@ -10802,6 +10894,7 @@
 sessionGetAsyncContext _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_session_get_async_context _obj'
+    checkUnexpectedReturnNULL "soup_session_get_async_context" result
     result' <- (newBoxed GLib.MainContext) result
     touchManagedPtr _obj
     return result'
@@ -10830,6 +10923,7 @@
     let _obj' = unsafeManagedPtrCastPtr _obj
     let feature_type' = gtypeToCGType feature_type
     result <- soup_session_get_feature _obj' feature_type'
+    checkUnexpectedReturnNULL "soup_session_get_feature" result
     result' <- (newObject SessionFeature) result
     touchManagedPtr _obj
     return result'
@@ -10861,6 +10955,7 @@
     let feature_type' = gtypeToCGType feature_type
     let msg' = unsafeManagedPtrCastPtr msg
     result <- soup_session_get_feature_for_message _obj' feature_type' msg'
+    checkUnexpectedReturnNULL "soup_session_get_feature_for_message" result
     result' <- (newObject SessionFeature) result
     touchManagedPtr _obj
     touchManagedPtr msg
@@ -10890,6 +10985,7 @@
     let _obj' = unsafeManagedPtrCastPtr _obj
     let feature_type' = gtypeToCGType feature_type
     result <- soup_session_get_features _obj' feature_type'
+    checkUnexpectedReturnNULL "soup_session_get_features" result
     result' <- unpackGSList result
     result'' <- mapM (newObject SessionFeature) result'
     g_slist_free result
@@ -10985,7 +11081,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr AddressCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr AddressCallbackC))
     maybeCallback <- case callback of
         Nothing -> return (castPtrToFunPtr nullPtr)
         Just jCallback -> do
@@ -11053,7 +11149,7 @@
 sessionQueueMessage _obj msg callback = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     msg' <- refObject msg
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr SessionCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr SessionCallbackC))
     maybeCallback <- case callback of
         Nothing -> return (castPtrToFunPtr nullPtr)
         Just jCallback -> do
@@ -11176,6 +11272,7 @@
     uri_string' <- textToCString uri_string
     onException (do
         result <- propagateGError $ soup_session_request _obj' uri_string'
+        checkUnexpectedReturnNULL "soup_session_request" result
         result' <- (wrapObject Request) result
         touchManagedPtr _obj
         freeMem uri_string'
@@ -11213,6 +11310,7 @@
     uri_string' <- textToCString uri_string
     onException (do
         result <- propagateGError $ soup_session_request_http _obj' method' uri_string'
+        checkUnexpectedReturnNULL "soup_session_request_http" result
         result' <- (wrapObject RequestHTTP) result
         touchManagedPtr _obj
         freeMem method'
@@ -11252,6 +11350,7 @@
     let uri' = unsafeManagedPtrGetPtr uri
     onException (do
         result <- propagateGError $ soup_session_request_http_uri _obj' method' uri'
+        checkUnexpectedReturnNULL "soup_session_request_http_uri" result
         result' <- (wrapObject RequestHTTP) result
         touchManagedPtr _obj
         touchManagedPtr uri
@@ -11287,6 +11386,7 @@
     let uri' = unsafeManagedPtrGetPtr uri
     onException (do
         result <- propagateGError $ soup_session_request_uri _obj' uri'
+        checkUnexpectedReturnNULL "soup_session_request_uri" result
         result' <- (wrapObject Request) result
         touchManagedPtr _obj
         touchManagedPtr uri
@@ -11356,6 +11456,7 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ soup_session_send _obj' msg' maybeCancellable
+        checkUnexpectedReturnNULL "soup_session_send" result
         result' <- (wrapObject Gio.InputStream) result
         touchManagedPtr _obj
         touchManagedPtr msg
@@ -11398,7 +11499,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr Gio.AsyncReadyCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr Gio.AsyncReadyCallbackC))
     maybeCallback <- case callback of
         Nothing -> return (castPtrToFunPtr nullPtr)
         Just jCallback -> do
@@ -11438,6 +11539,7 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ soup_session_send_finish _obj' result_'
+        checkUnexpectedReturnNULL "soup_session_send_finish" result
         result' <- (wrapObject Gio.InputStream) result
         touchManagedPtr _obj
         touchManagedPtr result_
@@ -11498,6 +11600,7 @@
     let _obj' = unsafeManagedPtrCastPtr _obj
     let msg' = unsafeManagedPtrCastPtr msg
     result <- soup_session_steal_connection _obj' msg'
+    checkUnexpectedReturnNULL "soup_session_steal_connection" result
     result' <- (wrapObject Gio.IOStream) result
     touchManagedPtr _obj
     touchManagedPtr msg
@@ -11578,7 +11681,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr Gio.AsyncReadyCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr Gio.AsyncReadyCallbackC))
     maybeCallback <- case callback of
         Nothing -> return (castPtrToFunPtr nullPtr)
         Just jCallback -> do
@@ -11621,6 +11724,7 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ soup_session_websocket_connect_finish _obj' result_'
+        checkUnexpectedReturnNULL "soup_session_websocket_connect_finish" result
         result' <- (wrapObject WebsocketConnection) result
         touchManagedPtr _obj
         touchManagedPtr result_
@@ -11961,6 +12065,7 @@
     m SessionAsync
 sessionAsyncNew  = liftIO $ do
     result <- soup_session_async_new
+    checkUnexpectedReturnNULL "soup_session_async_new" result
     result' <- (wrapObject SessionAsync) result
     return result'
 
@@ -12200,6 +12305,7 @@
     m SessionSync
 sessionSyncNew  = liftIO $ do
     result <- soup_session_sync_new
+    checkUnexpectedReturnNULL "soup_session_sync_new" result
     result' <- (wrapObject SessionSync) result
     return result'
 
@@ -12254,7 +12360,7 @@
         Just jCancellable -> do
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
-    ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr SocketCallbackC)
+    ptrcallback <- callocMem :: IO (Ptr (FunPtr SocketCallbackC))
     callback' <- mkSocketCallback (socketCallbackWrapper (Just ptrcallback) callback)
     poke ptrcallback callback'
     let user_data = nullPtr
@@ -12364,6 +12470,7 @@
 socketGetLocalAddress _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_socket_get_local_address _obj'
+    checkUnexpectedReturnNULL "soup_socket_get_local_address" result
     result' <- (newObject Address) result
     touchManagedPtr _obj
     return result'
@@ -12389,6 +12496,7 @@
 socketGetRemoteAddress _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_socket_get_remote_address _obj'
+    checkUnexpectedReturnNULL "soup_socket_get_remote_address" result
     result' <- (newObject Address) result
     touchManagedPtr _obj
     return result'
@@ -13287,6 +13395,7 @@
             jUri_string' <- textToCString jUri_string
             return jUri_string'
     result <- soup_uri_new maybeUri_string
+    checkUnexpectedReturnNULL "soup_uri_new" result
     result' <- (wrapBoxed URI) result
     freeMem maybeUri_string
     return result'
@@ -13312,6 +13421,7 @@
 uRICopy _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_copy _obj'
+    checkUnexpectedReturnNULL "soup_uri_copy" result
     result' <- (wrapBoxed URI) result
     touchManagedPtr _obj
     return result'
@@ -13337,6 +13447,7 @@
 uRICopyHost _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_copy_host _obj'
+    checkUnexpectedReturnNULL "soup_uri_copy_host" result
     result' <- (wrapBoxed URI) result
     touchManagedPtr _obj
     return result'
@@ -13415,6 +13526,7 @@
 uRIGetFragment _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_get_fragment _obj'
+    checkUnexpectedReturnNULL "soup_uri_get_fragment" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -13440,6 +13552,7 @@
 uRIGetHost _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_get_host _obj'
+    checkUnexpectedReturnNULL "soup_uri_get_host" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -13465,6 +13578,7 @@
 uRIGetPassword _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_get_password _obj'
+    checkUnexpectedReturnNULL "soup_uri_get_password" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -13490,6 +13604,7 @@
 uRIGetPath _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_get_path _obj'
+    checkUnexpectedReturnNULL "soup_uri_get_path" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -13539,6 +13654,7 @@
 uRIGetQuery _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_get_query _obj'
+    checkUnexpectedReturnNULL "soup_uri_get_query" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -13564,6 +13680,7 @@
 uRIGetScheme _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_get_scheme _obj'
+    checkUnexpectedReturnNULL "soup_uri_get_scheme" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -13589,6 +13706,7 @@
 uRIGetUser _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- soup_uri_get_user _obj'
+    checkUnexpectedReturnNULL "soup_uri_get_user" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -13670,6 +13788,7 @@
     let _obj' = unsafeManagedPtrGetPtr _obj
     uri_string' <- textToCString uri_string
     result <- soup_uri_new_with_base _obj' uri_string'
+    checkUnexpectedReturnNULL "soup_uri_new_with_base" result
     result' <- (wrapBoxed URI) result
     touchManagedPtr _obj
     freeMem uri_string'
@@ -13974,6 +14093,7 @@
     let _obj' = unsafeManagedPtrGetPtr _obj
     let just_path_and_query' = (fromIntegral . fromEnum) just_path_and_query
     result <- soup_uri_to_string _obj' just_path_and_query'
+    checkUnexpectedReturnNULL "soup_uri_to_string" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr _obj
@@ -14119,6 +14239,7 @@
             jProtocol' <- textToCString jProtocol
             return jProtocol'
     result <- soup_websocket_connection_new stream' uri' type_' maybeOrigin maybeProtocol
+    checkUnexpectedReturnNULL "soup_websocket_connection_new" result
     result' <- (wrapObject WebsocketConnection) result
     touchManagedPtr stream
     touchManagedPtr uri
@@ -14205,6 +14326,7 @@
 websocketConnectionGetCloseData _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_websocket_connection_get_close_data _obj'
+    checkUnexpectedReturnNULL "soup_websocket_connection_get_close_data" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -14255,6 +14377,7 @@
 websocketConnectionGetIoStream _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_websocket_connection_get_io_stream _obj'
+    checkUnexpectedReturnNULL "soup_websocket_connection_get_io_stream" result
     result' <- (newObject Gio.IOStream) result
     touchManagedPtr _obj
     return result'
@@ -14280,6 +14403,7 @@
 websocketConnectionGetOrigin _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_websocket_connection_get_origin _obj'
+    checkUnexpectedReturnNULL "soup_websocket_connection_get_origin" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -14305,6 +14429,7 @@
 websocketConnectionGetProtocol _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_websocket_connection_get_protocol _obj'
+    checkUnexpectedReturnNULL "soup_websocket_connection_get_protocol" result
     result' <- cstringToText result
     touchManagedPtr _obj
     return result'
@@ -14355,6 +14480,7 @@
 websocketConnectionGetUri _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- soup_websocket_connection_get_uri _obj'
+    checkUnexpectedReturnNULL "soup_websocket_connection_get_uri" result
     result' <- (newBoxed URI) result
     touchManagedPtr _obj
     return result'
@@ -15364,6 +15490,7 @@
     header' <- textToCString header
     let origin' = unsafeManagedPtrGetPtr origin
     result <- soup_cookie_parse header' origin'
+    checkUnexpectedReturnNULL "soup_cookie_parse" result
     result' <- (wrapBoxed Cookie) result
     touchManagedPtr origin
     freeMem header'
@@ -15389,6 +15516,7 @@
 cookiesFromRequest msg = liftIO $ do
     let msg' = unsafeManagedPtrCastPtr msg
     result <- soup_cookies_from_request msg'
+    checkUnexpectedReturnNULL "soup_cookies_from_request" result
     result' <- unpackGSList result
     result'' <- mapM (wrapBoxed Cookie) result'
     g_slist_free result
@@ -15415,6 +15543,7 @@
 cookiesFromResponse msg = liftIO $ do
     let msg' = unsafeManagedPtrCastPtr msg
     result <- soup_cookies_from_response msg'
+    checkUnexpectedReturnNULL "soup_cookies_from_response" result
     result' <- unpackGSList result
     result'' <- mapM (wrapBoxed Cookie) result'
     g_slist_free result
@@ -15442,6 +15571,7 @@
     let cookies' = map unsafeManagedPtrGetPtr cookies
     cookies'' <- packGSList cookies'
     result <- soup_cookies_to_cookie_header cookies''
+    checkUnexpectedReturnNULL "soup_cookies_to_cookie_header" result
     result' <- cstringToText result
     freeMem result
     mapM_ touchManagedPtr cookies
@@ -15526,6 +15656,7 @@
 formDecode encoded_form = liftIO $ do
     encoded_form' <- textToCString encoded_form
     result <- soup_form_decode encoded_form'
+    checkUnexpectedReturnNULL "soup_form_decode" result
     result' <- unpackGHashTable result
     let result'' = mapFirst cstringUnpackPtr result'
     result''' <- mapFirstA cstringToText result''
@@ -15569,6 +15700,7 @@
     content_type <- allocMem :: IO (Ptr CString)
     file <- callocBoxedBytes 16 :: IO (Ptr Buffer)
     result <- soup_form_decode_multipart msg' maybeFile_control_name filename content_type file
+    checkUnexpectedReturnNULL "soup_form_decode_multipart" result
     result' <- unpackGHashTable result
     let result'' = mapFirst cstringUnpackPtr result'
     result''' <- mapFirstA cstringToText result''
@@ -15609,6 +15741,7 @@
 formEncodeDatalist form_data_set = liftIO $ do
     let form_data_set' = unsafeManagedPtrGetPtr form_data_set
     result <- soup_form_encode_datalist form_data_set'
+    checkUnexpectedReturnNULL "soup_form_encode_datalist" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr form_data_set
@@ -15639,6 +15772,7 @@
     let form_data_set''''' = mapSecond cstringPackPtr form_data_set''''
     form_data_set'''''' <- packGHashTable gStrHash gStrEqual (Just ptr_to_g_free) (Just ptr_to_g_free) form_data_set'''''
     result <- soup_form_encode_hash form_data_set''''''
+    checkUnexpectedReturnNULL "soup_form_encode_hash" result
     result' <- cstringToText result
     freeMem result
     unrefGHashTable form_data_set''''''
@@ -15670,6 +15804,7 @@
     uri' <- textToCString uri
     let form_data_set' = unsafeManagedPtrGetPtr form_data_set
     result <- soup_form_request_new_from_datalist method' uri' form_data_set'
+    checkUnexpectedReturnNULL "soup_form_request_new_from_datalist" result
     result' <- (wrapObject Message) result
     touchManagedPtr form_data_set
     freeMem method'
@@ -15707,6 +15842,7 @@
     let form_data_set''''' = mapSecond cstringPackPtr form_data_set''''
     form_data_set'''''' <- packGHashTable gStrHash gStrEqual (Just ptr_to_g_free) (Just ptr_to_g_free) form_data_set'''''
     result <- soup_form_request_new_from_hash method' uri' form_data_set''''''
+    checkUnexpectedReturnNULL "soup_form_request_new_from_hash" result
     result' <- (wrapObject Message) result
     freeMem method'
     freeMem uri'
@@ -15736,6 +15872,7 @@
     uri' <- textToCString uri
     let multipart' = unsafeManagedPtrGetPtr multipart
     result <- soup_form_request_new_from_multipart uri' multipart'
+    checkUnexpectedReturnNULL "soup_form_request_new_from_multipart" result
     result' <- (wrapObject Message) result
     touchManagedPtr multipart
     freeMem uri'
@@ -15879,6 +16016,7 @@
 headerParseList header = liftIO $ do
     header' <- textToCString header
     result <- soup_header_parse_list header'
+    checkUnexpectedReturnNULL "soup_header_parse_list" result
     result' <- unpackGSList result
     result'' <- mapM cstringToText result'
     mapGSList freeMem result
@@ -15906,6 +16044,7 @@
 headerParseParamList header = liftIO $ do
     header' <- textToCString header
     result <- soup_header_parse_param_list header'
+    checkUnexpectedReturnNULL "soup_header_parse_param_list" result
     result' <- unpackGHashTable result
     let result'' = mapFirst cstringUnpackPtr result'
     result''' <- mapFirstA cstringToText result''
@@ -15938,6 +16077,7 @@
     header' <- textToCString header
     unacceptable <- allocMem :: IO (Ptr (Ptr (GSList CString)))
     result <- soup_header_parse_quality_list header' unacceptable
+    checkUnexpectedReturnNULL "soup_header_parse_quality_list" result
     result' <- unpackGSList result
     result'' <- mapM cstringToText result'
     mapGSList freeMem result
@@ -15971,6 +16111,7 @@
 headerParseSemiParamList header = liftIO $ do
     header' <- textToCString header
     result <- soup_header_parse_semi_param_list header'
+    checkUnexpectedReturnNULL "soup_header_parse_semi_param_list" result
     result' <- unpackGHashTable result
     let result'' = mapFirst cstringUnpackPtr result'
     result''' <- mapFirstA cstringToText result''
@@ -16243,6 +16384,7 @@
     m T.Text
 statusGetPhrase status_code = liftIO $ do
     result <- soup_status_get_phrase status_code
+    checkUnexpectedReturnNULL "soup_status_get_phrase" result
     result' <- cstringToText result
     return result'
 
@@ -16377,6 +16519,7 @@
     hostname' <- textToCString hostname
     onException (do
         result <- propagateGError $ soup_tld_get_base_domain hostname'
+        checkUnexpectedReturnNULL "soup_tld_get_base_domain" result
         result' <- cstringToText result
         freeMem hostname'
         return result'
@@ -16404,6 +16547,7 @@
 uriDecode part = liftIO $ do
     part' <- textToCString part
     result <- soup_uri_decode part'
+    checkUnexpectedReturnNULL "soup_uri_decode" result
     result' <- cstringToText result
     freeMem result
     freeMem part'
@@ -16436,6 +16580,7 @@
             jEscape_extra' <- textToCString jEscape_extra
             return jEscape_extra'
     result <- soup_uri_encode part' maybeEscape_extra
+    checkUnexpectedReturnNULL "soup_uri_encode" result
     result' <- cstringToText result
     freeMem result
     freeMem part'
@@ -16465,6 +16610,7 @@
     part' <- textToCString part
     unescape_extra' <- textToCString unescape_extra
     result <- soup_uri_normalize part' unescape_extra'
+    checkUnexpectedReturnNULL "soup_uri_normalize" result
     result' <- cstringToText result
     freeMem result
     freeMem part'
@@ -16488,6 +16634,7 @@
     m GObject.ValueArray
 valueArrayNew  = liftIO $ do
     result <- soup_value_array_new
+    checkUnexpectedReturnNULL "soup_value_array_new" result
     result' <- (wrapBoxed GObject.ValueArray) result
     return result'
 
@@ -16698,6 +16845,7 @@
     let params' = map unsafeManagedPtrGetPtr params
     params'' <- packBlockArray 24 params'
     result <- soup_xmlrpc_build_method_call method_name' params'' n_params
+    checkUnexpectedReturnNULL "soup_xmlrpc_build_method_call" result
     result' <- cstringToText result
     freeMem result
     mapM_ touchManagedPtr params
@@ -16725,6 +16873,7 @@
 xmlrpcBuildMethodResponse value = liftIO $ do
     let value' = unsafeManagedPtrGetPtr value
     result <- soup_xmlrpc_build_method_response value'
+    checkUnexpectedReturnNULL "soup_xmlrpc_build_method_response" result
     result' <- cstringToText result
     freeMem result
     touchManagedPtr value
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -454,49 +454,3 @@
 FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/gi-soup.cabal b/gi-soup.cabal
--- a/gi-soup.cabal
+++ b/gi-soup.cabal
@@ -1,6 +1,6 @@
 -- Autogenerated, do not edit.
 name:               gi-soup
-version:            0.2.50.9
+version:            0.2.50.10
 synopsis:           Soup bindings
 description:        Bindings for Soup, autogenerated by haskell-gi.
 homepage:           https://github.com/haskell-gi/haskell-gi
@@ -17,10 +17,10 @@
     exposed-modules:    GI.Soup, GI.SoupAttributes, GI.SoupSignals
     pkgconfig-depends:  libsoup-2.4 >= 2.50
     build-depends: base >= 4.7 && <5,
-        haskell-gi-base >= 0.9 && < 1,
-        gi-glib >= 0.2.44.9 && < 0.3,
-        gi-gobject >= 0.2.44.9 && < 0.3,
-        gi-gio >= 0.2.44.9 && < 0.3,
+        haskell-gi-base >= 0.10 && < 1,
+        gi-glib >= 0.2.44.10 && < 0.3,
+        gi-gobject >= 0.2.44.10 && < 0.3,
+        gi-gio >= 0.2.44.10 && < 0.3,
         bytestring >= 0.10,
         containers >= 0.5,
         text >= 1.0,
