diff --git a/src/script/dependency.cpp b/src/script/dependency.cpp
index e32cfbd3..abae1819 100644
--- a/src/script/dependency.cpp
+++ b/src/script/dependency.cpp
@@ -304,7 +304,7 @@ ScriptValueP Context::dependencies(const Dependency& dep, const Script& script)
 		if (scope) closeScope(scope); // restore scope
 		stack.resize(stack_size);     // restore stack
 		// delete jump records
-		while(jumps.empty()) {
+		while (!jumps.empty()) {
 			delete jumps.top();
 			jumps.pop();
 		}
diff --git a/src/script/image.cpp b/src/script/image.cpp
index 09485b35..956d750b 100644
--- a/src/script/image.cpp
+++ b/src/script/image.cpp
@@ -142,6 +142,7 @@ template <> void Reader::handle(ScriptableImage& s) {
 		// script is a constant function
 		s.script.script = new_intrusive<Script>();
 		s.script.script->addInstruction(I_PUSH_CONST, s.script.unparsed);
+		s.script.script->addInstruction(I_RET);
 	}
 }
 template <> void Writer::handle(const ScriptableImage& s) {