Error handling. Maybe Overkill.
Merge branch 'dev'