diff --git a/src/gui/value/choice.cpp b/src/gui/value/choice.cpp
index 907aebdb..45e139d3 100644
--- a/src/gui/value/choice.cpp
+++ b/src/gui/value/choice.cpp
@@ -203,7 +203,7 @@ void DropDownChoiceListBase::generateThumbnailImages() {
 			ScriptableImage& img = s.choice_images[name];
 			if (!img.update(ctx) && status == THUMB_CHANGED) {
 				status = THUMB_OK; // no need to rebuild
-			} else {
+			} else if (img.isReady()) {
 				// request this thumbnail
 				thumbnail_thread.request( new_intrusive4<ChoiceThumbnailRequest>(
 						&cve, i, status == THUMB_NOT_MADE && !img.local(), img.threadSafe()
diff --git a/src/script/functions/english.cpp b/src/script/functions/english.cpp
index 1bf73c9e..67f4f7c2 100644
--- a/src/script/functions/english.cpp
+++ b/src/script/functions/english.cpp
@@ -122,13 +122,14 @@ String do_english_num(String input, String(*fun)(int)) {
 				}
 			}
 		}
+		return _("<hint-2>") + input;
 	} else {
 		long i = 0;
 		if (input.ToLong(&i)) {
 			return fun(i);
 		}
+		return input;
 	}
-	return input;
 }
 
 SCRIPT_FUNCTION(english_number) {