Index: main/manager.c
===================================================================
--- main/manager.c	(revision 152924)
+++ main/manager.c	(working copy)
@@ -1522,7 +1522,7 @@
 	if (s->waiting_thread == pthread_self()) {
 		struct eventqent *eqe;
 		astman_send_response(s, m, "Success", "Waiting for Event completed.");
-		while ( (eqe = NEW_EVENT(s)) ) {
+		while ( s->last_ev && (eqe = NEW_EVENT(s)) ) {
 			ref_event(eqe);
 			if (((s->readperm & eqe->category) == eqe->category) &&
 			    ((s->send_events & eqe->category) == eqe->category)) {
@@ -2390,7 +2390,7 @@
 	if (s->f != NULL) {
 		struct eventqent *eqe;
 
-		while ( (eqe = NEW_EVENT(s)) ) {
+		while ( s->last_ev && (eqe = NEW_EVENT(s)) ) {
 			ref_event(eqe);
 			if (!ret && s->authenticated &&
 			    (s->readperm & eqe->category) == eqe->category &&