Merge branch 'stable-3.3' into master

* stable-3.3:
  Fix error handling when project state is empty

Change-Id: Iff2a3718f6eba5d410740e9517d899fa60184dd7