Yeah, easiest way to solve that problem is with more handeling.