added error handeling for less suck