Added support for filp/whoops

Cleanup of buggy commit