diff --git a/CHANGELOG b/CHANGELOG
index 4e344b74..9eafaa6d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2.3.3 (2018-05-09)
+=========================
+
+- Fix crash when browser integration is enabled [#1923]
+
 2.3.2 (2018-05-07)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a33ea241..a4cb4d1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "2")
+set(KEEPASSXC_VERSION_PATCH "3")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
@@ -117,6 +117,10 @@ elseif(KEEPASSXC_DIST_TYPE STREQUAL "Other")
   unset(KEEPASSXC_DIST)
 endif()
 
+if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+  set(IS_32BIT TRUE)
+endif()
+
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)
 endif()
@@ -237,8 +241,13 @@ if(MINGW)
   set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
   if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
     # Enable DEP and ASLR
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--high-entropy-va")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--high-entropy-va")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+    # Enable high entropy ASLR for 64-bit builds
+    if(NOT IS_32BIT)
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--high-entropy-va")
+      set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--high-entropy-va")
+    endif()
   endif()
 endif()
 
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index ba7f8e6f..2f174794 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,13 @@
     </screenshots>
 
     <releases>
+        <release version="2.3.3" date="2018-05-09">
+            <description>
+                <ul>
+                    <li>Fix crash when browser integration is enabled [#1923]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.3.2" date="2018-05-07">
             <description>
                 <ul>
diff --git a/share/translations/keepassx_ca.ts b/share/translations/keepassx_ca.ts
index a0981113..20316f16 100644
--- a/share/translations/keepassx_ca.ts
+++ b/share/translations/keepassx_ca.ts
@@ -260,7 +260,7 @@ Seleccioneu si voleu permetre l&apos;accés.</translation>
     </message>
     <message>
         <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Sol·licitar el desbloqueig de la base de dades si està blocada</translation>
+        <translation>Sol·licita el desbloqueig de la base de dades si està blocada</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
@@ -575,7 +575,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Copy history</source>
-        <translation>Còpia el historial</translation>
+        <translation>Copia el historial</translation>
     </message>
 </context>
 <context>
@@ -1248,7 +1248,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Never</source>
-        <translation type="unfinished"/>
+        <translation>Mai</translation>
     </message>
     <message>
         <source>[PROTECTED]</source>
@@ -1897,7 +1897,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Never</source>
-        <translation type="unfinished"/>
+        <translation>Mai</translation>
     </message>
     <message>
         <source>Password</source>
@@ -1913,15 +1913,15 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Created</source>
-        <translation type="unfinished"/>
+        <translation>Creat</translation>
     </message>
     <message>
         <source>Modified</source>
-        <translation type="unfinished"/>
+        <translation>Modificat</translation>
     </message>
     <message>
         <source>Accessed</source>
-        <translation type="unfinished"/>
+        <translation>Accedit</translation>
     </message>
     <message>
         <source>Attachments</source>
@@ -2667,7 +2667,7 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
     </message>
     <message>
         <source>&amp;Close database</source>
-        <translation>Tanca base de dades</translation>
+        <translation>Tanca la base de dades</translation>
     </message>
     <message>
         <source>&amp;New database</source>
@@ -2727,11 +2727,11 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
     </message>
     <message>
         <source>Copy &amp;username</source>
-        <translation>Còpia el nom d&apos;&amp;usuari</translation>
+        <translation>Copia el nom d&apos;&amp;usuari</translation>
     </message>
     <message>
         <source>Copy username to clipboard</source>
-        <translation>Còpia el nom d&apos;usuari al porta-retalls</translation>
+        <translation>Copia el nom d&apos;usuari al porta-retalls</translation>
     </message>
     <message>
         <source>Cop&amp;y password</source>
@@ -2739,11 +2739,11 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
     </message>
     <message>
         <source>Copy password to clipboard</source>
-        <translation>Còpia la contrasenya  al porta-retalls</translation>
+        <translation>Copia la contrasenya al porta-retalls</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation>&amp;Conficuració</translation>
+        <translation>&amp;Configuració</translation>
     </message>
     <message>
         <source>Password Generator</source>
@@ -2751,7 +2751,7 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
     </message>
     <message>
         <source>&amp;Perform Auto-Type</source>
-        <translation>Realitza complació automètica</translation>
+        <translation>Realitza compleció automàtica</translation>
     </message>
     <message>
         <source>&amp;Open URL</source>
@@ -2759,7 +2759,7 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
     </message>
     <message>
         <source>&amp;Lock databases</source>
-        <translation>&amp;bloqueja la bases de dades</translation>
+        <translation>&amp;Bloqueja la bases de dades</translation>
     </message>
     <message>
         <source>&amp;Title</source>
@@ -3510,11 +3510,11 @@ Available commands:
     </message>
     <message>
         <source>Last Modified</source>
-        <translation type="unfinished"/>
+        <translation>Darrera modificació</translation>
     </message>
     <message>
         <source>Created</source>
-        <translation type="unfinished"/>
+        <translation>Creat</translation>
     </message>
     <message>
         <source>Legacy Browser Integration</source>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 16810cd5..5a3597c3 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.3.2
+version: 2.3.3
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
diff --git a/src/browser/NativeMessagingHost.cpp b/src/browser/NativeMessagingHost.cpp
index f6507ae9..54ed6a9f 100644
--- a/src/browser/NativeMessagingHost.cpp
+++ b/src/browser/NativeMessagingHost.cpp
@@ -80,7 +80,7 @@ void NativeMessagingHost::run()
         QFile::remove(serverPath);
 
         // Ensure that STDIN is not being listened when proxy is used
-        if (m_notifier->isEnabled()) {
+        if (m_notifier && m_notifier->isEnabled()) {
             m_notifier->setEnabled(false);
         }