MEF - Improve exception handling / Fix docstrings