Fixed return true, exception issues and dependency insertion.