Prevent null pointer exception in onFail method. Set non-blocking wait
timeout to 300000 millis.
Merge branch 'master' of git@github.com:Dexels/navajo.git