Before action filter lingering promise(s)

- Solves issue #354