exception fix
refactored controller action dispatch