had to move exceotion handlers back to controllers