Remove the throw and added some debugging