diff --git a/O365/connection.py b/O365/connection.py
index 1711a7a4c77a2..88a86b063c637 100644
--- a/O365/connection.py
+++ b/O365/connection.py
@@ -182,12 +182,12 @@ def get_iana_tz(windows_tz):
 
     def get_windows_tz(self, iana_tz=None):
         """ Returns a valid windows TimeZone from a given pytz TimeZone (Iana/Olson Timezones)
-        Note: Windows Timezones are SHIT!.. no .. really THEY ARE HOLY FUCKING SHIT!
+        Note: Windows Timezones are SHIT!.. no .. really THEY ARE HOLY FUCKING SHIT!. I AGREE
         """
         iana_tz = iana_tz or self.timezone
         timezone = IANA_TO_WIN.get(iana_tz.zone if isinstance(iana_tz, tzinfo) else iana_tz)
         if timezone is None:
-            raise pytz.UnknownTimeZoneError("Can't find Iana TimeZone " + iana_tz)
+            raise pytz.UnknownTimeZoneError("Can't find Iana TimeZone " + iana_tz.zone)
 
         return timezone
 
diff --git a/setup.py b/setup.py
index 90e778f58070d..4ba65d7d53f43 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@
       maintainer='Janscas',
       maintainer_email='janscas@users.noreply.github.com',
       url='https://github.com/janscas/py-o365',
-      packages=['O365'],
+      packages=['O365','O365.utils'],
       install_requires=['requests', 'oauthlib', 'requests_oauthlib', 'beautifulsoup4', 'stringcase', 'python-dateutil', 'tzlocal'],
       license='Apache 2.0',
       classifiers=CLASSIFIERS