Merge "Fix for NullPointerException"