Added error checking and bumped version