added fix for null pointer exception while fetching the workspace