diff --git a/android/jni/com/mapswithme/country/ActiveCountryTree.cpp b/android/jni/com/mapswithme/country/ActiveCountryTree.cpp index e21103bb8b..02ab31635f 100644 --- a/android/jni/com/mapswithme/country/ActiveCountryTree.cpp +++ b/android/jni/com/mapswithme/country/ActiveCountryTree.cpp @@ -90,8 +90,10 @@ extern "C" Java_com_mapswithme_country_ActiveCountryTree_getGuideInfo(JNIEnv * env, jclass clazz, jint group, jint position) { guides::GuideInfo info; - GetMapLayout().GetGuideInfo(ToGroup(group), position, info); - return guides::GuideNativeToJava(env, info); + if (GetMapLayout().GetGuideInfo(ToGroup(group), position, info)) + return guides::GuideNativeToJava(env, info); + + return NULL; } JNIEXPORT void JNICALL