diff --git a/GreenshotFlickrPlugin/FlickrPlugin.cs b/GreenshotFlickrPlugin/FlickrPlugin.cs
index 587326510..544651d98 100644
--- a/GreenshotFlickrPlugin/FlickrPlugin.cs
+++ b/GreenshotFlickrPlugin/FlickrPlugin.cs
@@ -155,7 +155,7 @@ namespace GreenshotFlickrPlugin {
 						uploader.upload(stream);
 						MessageBox.Show(lang.GetString(LangKey.upload_success));
 					} catch(Exception e) {
-						LOG.Debug("Problem uploading", e);
+						LOG.Error("Problem uploading", e);
 						MessageBox.Show(lang.GetString(LangKey.upload_failure) + " " + e.Message);
 					}
 				}
diff --git a/GreenshotFlickrPlugin/Forms/FlickrUploadForm.cs b/GreenshotFlickrPlugin/Forms/FlickrUploadForm.cs
index 8c631c260..61bedbe31 100644
--- a/GreenshotFlickrPlugin/Forms/FlickrUploadForm.cs
+++ b/GreenshotFlickrPlugin/Forms/FlickrUploadForm.cs
@@ -82,6 +82,10 @@ namespace GreenshotFlickrPlugin {
 			flickr.PhotosSetMeta(photoId, "New Title", "New Description");
 			// Get list of users sets
 			PhotosetCollection sets = flickr.PhotosetsGetList();
+			if (sets.Count == 0) {
+				flickr.PhotosetsCreate("Greenshot", "Greenshot screenshots", photoId);
+				sets = flickr.PhotosetsGetList();
+			}
 			// Get the first set in the collection
 			Photoset set = sets[0];
 			// Add the photo to that set