Fixed a nullpointerexception error in trip activity.
Merge remote-tracking branch 'origin/master'