Some small corrections. Basic Exception handling