diff --git a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt
index c0e58df1..0dd81d46 100644
--- a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt
+++ b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt
@@ -146,7 +146,7 @@ class SubsonicAPIClientTest {
     fun `Should parse get music folders error response`() {
         val response = checkErrorCallParsed { client.api.getMusicFolders().execute() }
 
-        response.musicFolders `should be` null
+        response.musicFolders `should equal` emptyList()
     }
 
     @Test
diff --git a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicFolder.kt b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicFolder.kt
index 13484b2c..291a55e1 100644
--- a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicFolder.kt
+++ b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicFolder.kt
@@ -1,3 +1,3 @@
 package org.moire.ultrasonic.api.subsonic.models
 
-data class MusicFolder(val id: Long, val name: String)
\ No newline at end of file
+data class MusicFolder(val id: Long = -1, val name: String = "")
\ No newline at end of file
diff --git a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt
index de133a27..24f91058 100644
--- a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt
+++ b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt
@@ -14,7 +14,7 @@ class MusicFoldersResponse(status: Status,
                            version: SubsonicAPIVersions,
                            error: SubsonicError?,
                            @JsonDeserialize(using = MusicFoldersDeserializer::class)
-                           val musicFolders: List<MusicFolder>?):
+                           val musicFolders: List<MusicFolder> = emptyList()):
         SubsonicResponse(status, version, error) {
     companion object {
         class MusicFoldersDeserializer(): JsonDeserializer<List<MusicFolder>>() {
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/SubsonicAPIConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/SubsonicAPIConverter.kt
new file mode 100644
index 00000000..c3bcb28d
--- /dev/null
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/SubsonicAPIConverter.kt
@@ -0,0 +1,5 @@
+package org.moire.ultrasonic.data
+
+/**
+ * Created by egorr on 26.07.17.
+ */
diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
new file mode 100644
index 00000000..3b556b48
--- /dev/null
+++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
@@ -0,0 +1,8 @@
+package org.moire.ultrasonic.data
+
+import org.junit.Assert.*
+
+/**
+ * Created by egorr on 26.07.17.
+ */
+class APIConverterTest
\ No newline at end of file