3 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 602067a0e7..cf18cafe90 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.1.0-b4-dev');
+define('PHPBB_VERSION', '3.1.0-b5-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 77ad2d202c..94eef89c05 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -311,6 +311,9 @@ class filespec
 		if (file_exists($this->destination_file) && !$overwrite)
 		{
 			@unlink($this->filename);
+			$this->error[] = $user->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file);
+			$this->file_moved = false;
+			return false;
 		}
 		else
 		{
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index 65a193193a..50fcd11bee 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -177,7 +177,11 @@ else
 {
 	if (!file_exists($phpbb_root_path . 'vendor/autoload.php'))
 	{
-		trigger_error('You have not set up composer dependencies. See http://getcomposer.org/.', E_USER_ERROR);
+		trigger_error(
+			'Composer dependencies have not been set up yet, run ' .
+			"'php ../composer.phar install' from the phpBB directory to do so.",
+			E_USER_ERROR
+		);
 	}
 	require($phpbb_root_path . 'vendor/autoload.php');
 }