Misc update

Error handling
Route updates