diff --git a/frontend/src/AddArtist/AddNewArtist/AddNewArtist.js b/frontend/src/AddArtist/AddNewArtist/AddNewArtist.js
index 677d7bce4..3b1959982 100644
--- a/frontend/src/AddArtist/AddNewArtist/AddNewArtist.js
+++ b/frontend/src/AddArtist/AddNewArtist/AddNewArtist.js
@@ -101,6 +101,7 @@ class AddNewArtist extends Component {
               value={term}
               placeholder="eg. Breaking Benjamin, lidarr:854a1807-025b-42a8-ba8c-2a39717f1d25"
               onChange={this.onSearchInputChange}
+              autoFocus={true}
             />
 
             <Button
diff --git a/frontend/src/Artist/ArtistBanner.js b/frontend/src/Artist/ArtistBanner.js
index 6bc5d7fe6..041130352 100644
--- a/frontend/src/Artist/ArtistBanner.js
+++ b/frontend/src/Artist/ArtistBanner.js
@@ -69,6 +69,15 @@ class ArtistBanner extends Component {
         // show the new image, whether an image was shown previously
         // or the placeholder was shown.
       });
+
+      // The poster could not be loaded..
+      if (!nextBanner && (this.props !== prevProps)) {
+        this.setState({
+          banner: undefined,
+          bannerUrl: bannerPlaceholder,
+          hasError: true
+        });
+      }
     }
   }
 
diff --git a/frontend/src/Artist/ArtistPoster.js b/frontend/src/Artist/ArtistPoster.js
index 25b744c80..ca59f750c 100644
--- a/frontend/src/Artist/ArtistPoster.js
+++ b/frontend/src/Artist/ArtistPoster.js
@@ -70,6 +70,15 @@ class ArtistPoster extends Component {
         // or the placeholder was shown.
       });
     }
+
+    // The poster could not be loaded..
+    if (!nextPoster && (this.props !== prevProps)) {
+      this.setState({
+        poster: undefined,
+        posterUrl: posterPlaceholder,
+        hasError: true
+      });
+    }
   }
 
   //
diff --git a/frontend/src/Artist/Delete/DeleteArtistModalContent.js b/frontend/src/Artist/Delete/DeleteArtistModalContent.js
index 444b75bc8..6a6435301 100644
--- a/frontend/src/Artist/Delete/DeleteArtistModalContent.js
+++ b/frontend/src/Artist/Delete/DeleteArtistModalContent.js
@@ -127,7 +127,7 @@ DeleteArtistModalContent.propTypes = {
   artistName: PropTypes.string.isRequired,
   path: PropTypes.string.isRequired,
   trackFileCount: PropTypes.number.isRequired,
-  sizeOnDisk: PropTypes.number.isRequired,
+  sizeOnDisk: PropTypes.number,
   onDeletePress: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
diff --git a/frontend/src/Artist/Details/ArtistDetails.js b/frontend/src/Artist/Details/ArtistDetails.js
index 5793cbce2..9ee23dd68 100644
--- a/frontend/src/Artist/Details/ArtistDetails.js
+++ b/frontend/src/Artist/Details/ArtistDetails.js
@@ -583,7 +583,7 @@ ArtistDetails.propTypes = {
   artistName: PropTypes.string.isRequired,
   ratings: PropTypes.object.isRequired,
   path: PropTypes.string.isRequired,
-  sizeOnDisk: PropTypes.number.isRequired,
+  sizeOnDisk: PropTypes.number,
   trackFileCount: PropTypes.number,
   qualityProfileId: PropTypes.number.isRequired,
   monitored: PropTypes.bool.isRequired,
diff --git a/frontend/src/Artist/Index/Posters/ArtistIndexPosterInfo.js b/frontend/src/Artist/Index/Posters/ArtistIndexPosterInfo.js
index 591961605..95039ffa7 100644
--- a/frontend/src/Artist/Index/Posters/ArtistIndexPosterInfo.js
+++ b/frontend/src/Artist/Index/Posters/ArtistIndexPosterInfo.js
@@ -103,7 +103,7 @@ ArtistIndexPosterInfo.propTypes = {
   showQualityProfile: PropTypes.bool.isRequired,
   previousAiring: PropTypes.string,
   added: PropTypes.string,
-  albumCount: PropTypes.number.isRequired,
+  albumCount: PropTypes.number,
   path: PropTypes.string.isRequired,
   sizeOnDisk: PropTypes.number,
   sortKey: PropTypes.string.isRequired,