SlimLocation supports Optional addresses

app/models/Location.scala

@@ -106,7 +106,7 @@ object Location {
         }
 
         query().map {
-          row => SlimLocation(row[Int]("id"), row[String]("name"), row[String]("address"))
+          row => SlimLocation(row[Int]("id"), row[String]("name"), row[Option[String]]("address"))
         }.toList
       }
     }
@@ -161,4 +161,4 @@ object Location {
  * A slimmed down version of the Location class used to represent the data we need when selecting
  * a location.
  */
-case class SlimLocation(id: Int, name: String, address: String)
+case class SlimLocation(id: Int, name: String, address: Option[String])

app/util/TypeConversions.scala

@@ -3,6 +3,7 @@ package util
 import models._
 import scala.util.{Try, Success, Failure}
 import play.api.libs.json._
+import play.api.i18n.Messages
 
 /**
  * Contains methods for performing and simplifying type conversions.
@@ -23,9 +24,10 @@ object TypeConversions {
    */
   def slimLocationsToJson(locations: Seq[SlimLocation]): JsValue = {
     val jsObjects = locations.map { location =>
+      val address = location.address.getOrElse(Messages("errors.unknownAddress"))
       Json.obj(
         "name" -> location.name,
-        "address" -> location.address,
+        "address" -> address,
         "id" -> location.id
       )
     }

conf/messages.en

@@ -57,3 +57,4 @@ errors.emptyCityTitle=There's no locations in this city
 errors.emptyCityDesc=Uh oh...
 errors.emptyCityText=There''s no locations in "{0}". Perhaps you''ve mistyped a URL or there''s a bug in our software.
 errors.emptyCityTryAgain=Give the city selection another try?
+errors.unknownAddress=Unknown address