adding of exceptions for safety