Core: Better Exception handling