Adding proper error routing to all methods