Add exceptions and remove genesis from controller