diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 3132ab97a..e1c2fe29c 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,58,0
- PRODUCTVERSION 0,9,58,0
+ FILEVERSION 0,9,59,0
+ PRODUCTVERSION 0,9,59,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
-            VALUE "FileVersion", "0.9.58.0"
+            VALUE "FileVersion", "0.9.59.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2016"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "0.9.58.0"
+            VALUE "ProductVersion", "0.9.59.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 69822ab7a..d569ff46b 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,58,0
- PRODUCTVERSION 0,9,58,0
+ FILEVERSION 0,9,59,0
+ PRODUCTVERSION 0,9,59,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Updater"
-            VALUE "FileVersion", "0.9.58.0"
+            VALUE "FileVersion", "0.9.59.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2016"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "0.9.58.0"
+            VALUE "ProductVersion", "0.9.59.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 795b8bef4..43d472653 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 #define BETA_VERSION_MACRO (0ULL)
 
-constexpr int AppVersion = 9058;
-constexpr str_const AppVersionStr = "0.9.58";
+constexpr int AppVersion = 9059;
+constexpr str_const AppVersionStr = "0.9.59";
 constexpr bool AppAlphaVersion = true;
 constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
diff --git a/Telegram/SourceFiles/media/media_audio.cpp b/Telegram/SourceFiles/media/media_audio.cpp
index f0411644c..32f2f79b9 100644
--- a/Telegram/SourceFiles/media/media_audio.cpp
+++ b/Telegram/SourceFiles/media/media_audio.cpp
@@ -357,7 +357,13 @@ void AudioPlayer::onStopped(const AudioMsgId &audio) {
 }
 
 AudioPlayer::AudioMsg *AudioPlayer::dataForType(AudioMsgId::Type type, int index) {
-	if (index < 0) index = *currentIndex(type);
+	if (index < 0) {
+		if (auto indexPtr = currentIndex(type)) {
+			index = *indexPtr;
+		} else {
+			return nullptr;
+		}
+	}
 	switch (type) {
 	case AudioMsgId::Type::Voice: return &_audioData[index];
 	case AudioMsgId::Type::Song: return &_songData[index];
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 205b86bde..249bd4e26 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -2531,7 +2531,7 @@
 				SDKROOT = macosx;
 				SYMROOT = ./../Mac;
 				TDESKTOP_MAJOR_VERSION = 0.9;
-				TDESKTOP_VERSION = 0.9.58;
+				TDESKTOP_VERSION = 0.9.59;
 			};
 			name = Release;
 		};
@@ -2672,7 +2672,7 @@
 				SDKROOT = macosx;
 				SYMROOT = ./../Mac;
 				TDESKTOP_MAJOR_VERSION = 0.9;
-				TDESKTOP_VERSION = 0.9.58;
+				TDESKTOP_VERSION = 0.9.59;
 			};
 			name = Debug;
 		};
diff --git a/Telegram/build/version b/Telegram/build/version
index f5aff1e62..5cd1e6e22 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion         9058
+AppVersion         9059
 AppVersionStrMajor 0.9
-AppVersionStrSmall 0.9.58
-AppVersionStr      0.9.58
+AppVersionStrSmall 0.9.59
+AppVersionStr      0.9.59
 AlphaChannel       1
 BetaVersion        0