Merge "NullPointerException in SQLiteSession"