Installation bug and better error handling