Added error returns.