Fix warnings with regards to no returns