Add check for error in SQLGenerator and remove check for equalties
Merge remote-tracking branch 'origin/feature/merge-develop-version2-041114' into feature/merge-develop-version2-041114