Couple of small bug fixes that were throwing exceptions that shouldnt have been