Added fixes for WIP with invalid handlers