Exception handling, build failure fix, etc