Some optionals fixed

## What? Why?
With beta6 some methods returned not optionals but with beta7 these returned items turned into optionals

## What should be tested?
The library works

## Related tasks? 
No related task
![image](http://media.giphy.com/media/y9VV9tmOwfDxu/giphy.gif)

what if we move this piece of code inside the if? - Or at least we have another context which isn't an optional. It's strange because `context` inside the if is implicitly unwrapped and we are doing it again here :S