diff --git a/bin/evening_detective_server b/bin/evening_detective_server
index ca8c240..94007e9 100755
Binary files a/bin/evening_detective_server and b/bin/evening_detective_server differ
diff --git a/internal/app/story_mapper.go b/internal/app/story_mapper.go
index ab47b36..3ad1d00 100644
--- a/internal/app/story_mapper.go
+++ b/internal/app/story_mapper.go
@@ -36,6 +36,9 @@ func mapScenario(o *scenarios_service.Scenario) *proto.Scenario {
 }
 
 func mapStory(o *storytelling.Story) *proto.Story {
+	if o == nil {
+		return nil
+	}
 	return &proto.Story{
 		Places: mapPlaces(o.Places),
 	}