Merge "Better protect staticly accessed resources to prevent exceptions"