Change where timeout set for #10.
Check if trip exists before attempting to delete it.  Should fix #16.