updated exception handling