Code formatting
Removed try/catch
Fix #453
2.1.6 release