diff --git a/upnpsoap.c b/upnpsoap.c
index ff8cf2c..b0baabd 100644
--- a/upnpsoap.c
+++ b/upnpsoap.c
@@ -689,7 +689,7 @@ callback(void *args, int argc, char **argv, char **azColName)
 		if( album_art && atoi(album_art) )
 		{
 			/* Video and audio album art is handled differently */
-			if( *mime == 'v' && (passed_args->filter & FILTER_RES) && (passed_args->flags & FLAG_MS_PFS) ) {
+			if( *mime == 'v' && (passed_args->filter & FILTER_RES) && !(passed_args->flags & FLAG_MS_PFS) ) {
 				ret = sprintf(str_buf, "<res protocolInfo=\"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN\">"
 				                       "http://%s:%d/AlbumArt/%s-%s.jpg"
 				                       "</res>",
@@ -917,15 +917,12 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
 			ObjectId = sqlite3_malloc(1);
 		goto browse_error;
 	}
-	if( !ObjectId )
+	if( !ObjectId && !(ObjectId = GetValueFromNameValueList(&data, "ContainerID")) )
 	{
-		if( !(ObjectId = GetValueFromNameValueList(&data, "ContainerID")) )
-		{
-			SoapError(h, 701, "No such object error");
-			if( h->reqflags & FLAG_MS_PFS )
-				ObjectId = sqlite3_malloc(1);
-			goto browse_error;
-		}
+		SoapError(h, 701, "No such object error");
+		if( h->reqflags & FLAG_MS_PFS )
+			ObjectId = sqlite3_malloc(1);
+		goto browse_error;
 	}
 	memset(&args, 0, sizeof(args));