Adding in some additional error returns.