This should probably go in an interceptor or something. @tfm can confirm.