[WIP] Added exceptions