diff --git a/cv b/cv
index d458fa4..dffa02e 100755
--- a/cv
+++ b/cv
@@ -117,6 +117,11 @@ else
 	result
 fi
 
-# FIXME: Dirty patch, needs to be improved asap
-[ ! -f $data/$date-$country ] && rm $data/$date-$country-out
-true
+# Cleanup and exit code handling.
+if [ ! -f $data/$date-$country ]
+then
+	rm $data/$date-$country-out
+	exit 1
+else
+	exit 0
+fi