Update call properties even if exceptions are thrown (fixes #260)
Drop unnecessary else clause to reduce nesting