diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index 975029049..4a1bc4f07 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -91,7 +91,6 @@ void CameraBox(
 			},
 			std::move(callback),
 			track->frame(FrameRequest()).mirrored(true, false));
-		box->closeBox();
 	};
 
 	box->setTitle(tr::lng_profile_camera_title());
@@ -274,10 +273,12 @@ void UserpicButton::choosePhotoLocally() {
 				const auto user = _peer ? _peer->asUser() : nullptr;
 				const auto name = (user && !user->firstName.isEmpty())
 					? user->firstName
-					: _peer->name();
+					: _peer
+					? _peer->name()
+					: QString();
 				const auto phrase = (type == ChosenType::Suggest)
 					? &tr::lng_profile_suggest_sure
-					: (_peer->isUser() && !_peer->isSelf())
+					: (user && !user->isSelf())
 					? &tr::lng_profile_set_personal_sure
 					: nullptr;
 				PrepareProfilePhotoFromFile(