Improved: error message
Upgraded: dependencies