Dependency fix
Fixed return true, exception issues and dependency insertion.
Merge pull request #216 from angathorion/dependency-insertion-fix

Dependency fix