diff --git a/gradle.properties b/gradle.properties
index c412038b2..f6770329b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms2048m -Xmx3072m
+org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError
 kotlin.incremental=true
\ No newline at end of file
diff --git a/travis/scripts/upload_error_logs.sh b/travis/scripts/upload_error_logs.sh
index 3a70f8c61..320d4910b 100755
--- a/travis/scripts/upload_error_logs.sh
+++ b/travis/scripts/upload_error_logs.sh
@@ -8,5 +8,6 @@ fi
 curl 'https://raw.githubusercontent.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh' -o travis/scripts/dropbox_uploader.sh
 chmod +x travis/scripts/dropbox_uploader.sh
 find /tmp -maxdepth 1 -name 'kotlin-daemon.*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/$(basename $1)' find-sh {} \;
+find /tmp -maxdepth 1 -name 'hs_err_pid*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/$(basename $1)' find-sh {} \;
 find ~/.gradle/daemon/ -name 'daemon-*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/gradle-$(basename $1)' find-sh {} \;
 dmesg > dmesg.log; travis/scripts/dropbox_uploader.sh upload dmesg.log ${TRAVIS_BUILD_ID}/dmesg.log