Issue 64 refactor controller rescues