Fixed SQL General Error bug
Merge branch 'develop'