Add return values to prevent initial error codes in prompt