Added better error handling and fixed diskgen warning