Basic Exception Handling added