Add error handling, session timeout more
Add error handling, session timeout more