Improving exception handling in TInjectable
fixed problems after merge