Added safety checks for installing