Added rought exception handling