Removed checking for specific exception message