Merge "Sometimes the application context is null"