Added some exception processing
Added some exception processing