The check for null notes was being done after notes had already been dereferenced earlier. If it was null, NPE would already have been raised. Remove the redundant check and add a call to checkNotNull earlier. Change-Id: I8eb39de4e6cfd32e6c1bf790e916a89b9c0c8593