Commit b54ed3efe88801df17ba7ceff40887dfabed0338

Brad Morgan 2013-05-15T12:41:16

Added error check