diff -ur /tmp/unrtf-0.21.1/src/attr.c src/attr.c
--- /tmp/unrtf-0.21.1/src/attr.c	2008-11-09 01:01:19.000000000 -0600
+++ src/attr.c	2010-07-27 10:42:16.000000000 -0500
@@ -350,7 +350,7 @@
 	AttrStack *stack = stack_of_stacks_top;
 	if (!stack) {
 		warning_handler("No stack to get attribute from");
-		return;
+		return NULL;
 	}
 
 	i=stack->tos;
@@ -572,7 +572,7 @@
 	while(prev_stack && prev_stack->next && prev_stack->next != stack)
 		prev_stack = prev_stack->next;
 
-	if (prev_stack) {
+	if (prev_stack != stack) {
 		stack_of_stacks_top = prev_stack;
 		prev_stack->next = NULL;
 	} else {
