added some error checking to prevent crashes

first commit, crossing fingers will work first time