Switch from assert to throw, add check for polyhedron