Added 'and return' to avoid double render error