added null check in controller, TripController + WaypointController