DEVSUPPORT-1161 Added Whoops