better exception handling in SI Repository