diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/impl/TweetV1.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/impl/TweetV1.java
index 1a53a58a..84b44d64 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/impl/TweetV1.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/impl/TweetV1.java
@@ -306,23 +306,22 @@ public class TweetV1 implements Status {
 			if (media.length() > 0) {
 				// determine MIME type
 				JSONObject mediaItem = media.getJSONObject(0);
-				String[] links = new String[media.length()];
 				String mime = mediaItem.getString("type");
 				switch (mime) {
 					case "photo":
 						mediaType = MEDIA_PHOTO;
 						// get media URLs
-						for (int pos = 0; pos < links.length; pos++) {
+						String[] links = new String[media.length()];
+						for (int pos = 0; pos < media.length(); pos++) {
 							JSONObject item = media.getJSONObject(pos);
-							if (item != null) {
-								links[pos] = item.getString("media_url_https");
-							}
+							links[pos] = item.getString("media_url_https");
 						}
 						return links;
 
 					case "video":
 						mediaType = MEDIA_VIDEO;
 						int maxBitrate = -1;
+						links = new String[1];
 						JSONObject video = mediaItem.getJSONObject("video_info");
 						JSONArray videoVariants = video.getJSONArray("variants");
 						for (int pos = 0; pos < videoVariants.length(); pos++) {
@@ -337,6 +336,7 @@ public class TweetV1 implements Status {
 
 					case "animated_gif":
 						mediaType = MEDIA_GIF;
+						links = new String[1];
 						JSONObject gif = mediaItem.getJSONObject("video_info");
 						JSONObject gifVariant = gif.getJSONArray("variants").getJSONObject(0);
 						if (MIME_V_MP4.equals(gifVariant.getString("content_type"))) {
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/fragments/AccountFragment.java b/app/src/main/java/org/nuclearfog/twidda/ui/fragments/AccountFragment.java
index a0698504..5b16235a 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/fragments/AccountFragment.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/fragments/AccountFragment.java
@@ -89,7 +89,7 @@ public class AccountFragment extends ListFragment implements OnAccountClickListe
 		// set new account
 		settings.setUserId(account.getId());
 		// setup Twitter account
-		if (account.getHostname().equals(Twitter.API)) {
+		if (Twitter.API.equals(account.getHostname())) {
 			settings.setAccessToken(account.getAccessToken());
 			settings.setTokenSecret(account.getTokenSecret());
 			if (!account.getApiKey().isEmpty() && !account.getApiSecret().isEmpty()) {