Updated Dependencies
Merge branch 'XhmikosR-master'
Fixed possible error-throwing path