diff --git a/exec/nntpservice.js b/exec/nntpservice.js
index d2245388701d26bb90ffed0d278c06cdab0a4751..bc535e52a16d3b97872575aa2af54912e179f73f 100644
--- a/exec/nntpservice.js
+++ b/exec/nntpservice.js
@@ -409,7 +409,8 @@ while(client.socket.is_connected) {
 				else
 					current_article=Number(cmd[1]);
 			}
-			if(typeof(current_article)=="number" && current_article<1) {
+			if(typeof(current_article)=="number" 
+				&& (current_article<1 || isNaN(current_article))) {
 				writeln("420 no current article has been selected");
 				break;
 			}
@@ -419,7 +420,7 @@ while(client.socket.is_connected) {
 			hdr=msgbase.get_msg_header(false,current_article);
 
 			if(hdr==null) {
-				writeln("430 no such article found");
+				writeln("430 no such article found: " + current_article);
 				break;
 			}