Merge pull request #234 from Dmitry-Me/errorCheckingNeverWorked

Error checking never actually checked anything