Fixed exception handling and build properties