Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Fix error handling when project state is empty Change-Id: Id657bfab45f3d0c06f5d7a6878f3986edf00d208