some exeception handling updates