Resource manager null on load failure, mask refactored + minor fixes