Actually, it needs to be `NotFound` - the tests break otherwise. As stated earlier, it'd be better to deal with a Future[Option[Result]] and return `NotFound` for that particular circumstance. I don't know if I want to go much further with this controller right now though.