diff -Nru kodi-18.0+git20190108.0202-4abe349/BUILDDATE kodi-18.0+git20190109.0202-adb55e2/BUILDDATE
--- kodi-18.0+git20190108.0202-4abe349/BUILDDATE	2019-01-08 01:02:08.000000000 +0000
+++ kodi-18.0+git20190109.0202-adb55e2/BUILDDATE	2019-01-09 01:02:15.000000000 +0000
@@ -1 +1 @@
-20190108
+20190109
diff -Nru kodi-18.0+git20190108.0202-4abe349/debian/changelog kodi-18.0+git20190109.0202-adb55e2/debian/changelog
--- kodi-18.0+git20190108.0202-4abe349/debian/changelog	2019-01-08 01:02:38.000000000 +0000
+++ kodi-18.0+git20190109.0202-adb55e2/debian/changelog	2019-01-09 01:02:44.000000000 +0000
@@ -1,4 +1,8 @@
-kodi (2:18.0+git20190108.0202-4abe349-0cosmic) cosmic; urgency=high
+kodi (2:18.0+git20190109.0202-adb55e2-0cosmic) cosmic; urgency=high
+
+  [DaveTBlake]
+   * Fix artist info dialog so when click on discography item that is not in library nothing happens (there is no album information to display)
+
 
   [Memphiz]
    * [PluginDirectory] - ensure that Abort of ScriptObserver waits for thread exit to prevent bad access of already destroyed event object
diff -Nru kodi-18.0+git20190108.0202-4abe349/debian/changelog.tmp kodi-18.0+git20190109.0202-adb55e2/debian/changelog.tmp
--- kodi-18.0+git20190108.0202-4abe349/debian/changelog.tmp	2019-01-08 01:02:38.000000000 +0000
+++ kodi-18.0+git20190109.0202-adb55e2/debian/changelog.tmp	2019-01-09 01:02:44.000000000 +0000
@@ -1,4 +1,8 @@
-kodi (2:18.0+git20190108.0202-4abe349-0dist) dist; urgency=high
+kodi (2:18.0+git20190109.0202-adb55e2-0dist) dist; urgency=high
+
+  [DaveTBlake]
+   * Fix artist info dialog so when click on discography item that is not in library nothing happens (there is no album information to display)
+
 
   [Memphiz]
    * [PluginDirectory] - ensure that Abort of ScriptObserver waits for thread exit to prevent bad access of already destroyed event object
diff -Nru kodi-18.0+git20190108.0202-4abe349/debian/changelog.tmp.old kodi-18.0+git20190109.0202-adb55e2/debian/changelog.tmp.old
--- kodi-18.0+git20190108.0202-4abe349/debian/changelog.tmp.old	2019-01-08 01:02:08.000000000 +0000
+++ kodi-18.0+git20190109.0202-adb55e2/debian/changelog.tmp.old	2019-01-09 01:02:15.000000000 +0000
@@ -1,5 +1,9 @@
 kodi (2:18.0+git20180719.0202-3231481-0dist) dist; urgency=high
 
+  [Memphiz]
+   * [PluginDirectory] - ensure that Abort of ScriptObserver waits for thread exit to prevent bad access of already destroyed event object
+
+
   [Attila Jakosa]
    * [lang][skin.estuary] updated language files from Transifex
 
diff -Nru kodi-18.0+git20190108.0202-4abe349/VERSION kodi-18.0+git20190109.0202-adb55e2/VERSION
--- kodi-18.0+git20190108.0202-4abe349/VERSION	2019-01-08 01:02:08.000000000 +0000
+++ kodi-18.0+git20190109.0202-adb55e2/VERSION	2019-01-09 01:02:15.000000000 +0000
@@ -1 +1 @@
-4abe349
+adb55e2
diff -Nru kodi-18.0+git20190108.0202-4abe349/xbmc/music/dialogs/GUIDialogMusicInfo.cpp kodi-18.0+git20190109.0202-adb55e2/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
--- kodi-18.0+git20190108.0202-4abe349/xbmc/music/dialogs/GUIDialogMusicInfo.cpp	2018-10-23 16:19:51.000000000 +0000
+++ kodi-18.0+git20190109.0202-adb55e2/xbmc/music/dialogs/GUIDialogMusicInfo.cpp	2019-01-09 01:02:00.000000000 +0000
@@ -398,11 +398,14 @@
           CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), iControl);
           CServiceBroker::GetGUI()->GetWindowManager().SendMessage(msg);
           int iItem = msg.GetParam1();
-          if (iItem < 0 || iItem >= m_albumSongs->Size())
-            break;
-          OnAlbumInfo(m_albumSongs->Get(iItem)->GetMusicInfoTag()->GetDatabaseId());
-
-          return true;
+          int id = -1;
+          if (iItem >= 0 && iItem < m_albumSongs->Size())
+              id = m_albumSongs->Get(iItem)->GetMusicInfoTag()->GetDatabaseId();
+          if (id > 0)
+          {
+            OnAlbumInfo(id);
+            return true;
+          }
         }
       }
     }
@@ -1010,10 +1013,12 @@
       // Maybe only path is set, then set MusicInfoTag
       CQueryParams params;
       CDirectoryNode::GetDatabaseInfo(pItem->GetPath(), params);
-      if (params.GetAlbumId() == -1)
+      if (params.GetArtistId() > 0)
         pItem->GetMusicInfoTag()->SetDatabaseId(params.GetArtistId(), MediaTypeArtist);
-      else
+      else if (params.GetAlbumId() > 0)
         pItem->GetMusicInfoTag()->SetDatabaseId(params.GetAlbumId(), MediaTypeAlbum);
+      else
+        return; // nothing to do
     }
     CGUIDialogMusicInfo *pDlgMusicInfo = CServiceBroker::GetGUI()->GetWindowManager().
 	  GetWindow<CGUIDialogMusicInfo>(WINDOW_DIALOG_MUSIC_INFO);