Added exeption support for offline