Resolving @Location value does not work as expected

The @Location annotation introduced with 2.0.0.Alpha5 does not work as described in the example of http://arquillian.org/blog/2013/09/04/arquillian-graphene-2-0-0-Alpha5/.
Using a non-absolute location value like "index.html" will throw an exception when trying to browse to the page using Graphene.goTo or using @InitialPage.

When looking at the sources of LocationEnricher I see 2 problems:

• contextRootStore is initialized too late in resolve method (line 70). It's already needed during goTo (line 110 in getURLFromLocation) which gets called before initialization (line 68).
• Using a non-absolute location value leads to an IllegalArgumentException in getURLFromLocation (line 146). I guess the catch block in line 116 is just for this purpose. Unfortunately there will be no URISyntaxException for non-absolute locations. They are perfectly fine URIs (until they get converted to URLs).