Adding proper Error objects per seanmonstar